From 9e5dfa2e5dde1e25efe7e05213d24946afffcb04 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 6 Oct 2022 13:36:03 +0200 Subject: [PATCH 1/3] Crypto/Dal: add an encoding for Dal parameters --- src/lib_crypto_dal/cryptobox.ml | 13 +++++++++++++ src/lib_crypto_dal/cryptobox_intf.ml | 3 +++ 2 files changed, 16 insertions(+) diff --git a/src/lib_crypto_dal/cryptobox.ml b/src/lib_crypto_dal/cryptobox.ml index 617f88c95ad1..a10c0345851f 100644 --- a/src/lib_crypto_dal/cryptobox.ml +++ b/src/lib_crypto_dal/cryptobox.ml @@ -333,6 +333,19 @@ module Inner = struct number_of_shards : int; } + let parameters_encoding = + let open Data_encoding in + conv + (fun {redundancy_factor; page_size; slot_size; number_of_shards} -> + (redundancy_factor, page_size, slot_size, number_of_shards)) + (fun (redundancy_factor, page_size, slot_size, number_of_shards) -> + {redundancy_factor; page_size; slot_size; number_of_shards}) + (obj4 + (req "redundancy_factor" uint8) + (req "page_size" uint16) + (req "slot_size" int31) + (req "number_of_shards" uint16)) + (* Error cases of this functions are not encapsulated into `tzresult` for modularity reasons. *) let make {redundancy_factor; slot_size; page_size; number_of_shards} = diff --git a/src/lib_crypto_dal/cryptobox_intf.ml b/src/lib_crypto_dal/cryptobox_intf.ml index ad5744acbbc6..95c0f4fb266c 100644 --- a/src/lib_crypto_dal/cryptobox_intf.ml +++ b/src/lib_crypto_dal/cryptobox_intf.ml @@ -58,6 +58,9 @@ module type VERIFIER = sig number_of_shards : int; } + (** An encoding for values of type {!parameters}. *) + val parameters_encoding : parameters Data_encoding.t + (** [make] precomputes the set of values needed by the cryptographic primitives defined in this module and stores them in a value of type [t] *) val make : parameters -> (t, [> `Fail of string]) result -- GitLab From ac57faf7729a1f09218e899c70696183c84c604f Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 6 Oct 2022 13:36:43 +0200 Subject: [PATCH 2/3] Env V8: expose Dal's parameters_encoding in Environment --- src/lib_protocol_environment/sigs/v8.ml | 3 +++ src/lib_protocol_environment/sigs/v8/dal.mli | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/lib_protocol_environment/sigs/v8.ml b/src/lib_protocol_environment/sigs/v8.ml index 3e57aa36653b..77af7ea6c7d6 100644 --- a/src/lib_protocol_environment/sigs/v8.ml +++ b/src/lib_protocol_environment/sigs/v8.ml @@ -11904,6 +11904,9 @@ type parameters = { number_of_shards : int; } +(** An encoding for values of type {!parameters}. *) +val parameters_encoding : parameters Data_encoding.t + (** [make] precomputes the set of values needed by cryptographic primitives defined in this module and store them in a value of type [t] *) val make : parameters -> (t, [> `Fail of string]) result diff --git a/src/lib_protocol_environment/sigs/v8/dal.mli b/src/lib_protocol_environment/sigs/v8/dal.mli index 3d4566627d53..a81d669d7c79 100644 --- a/src/lib_protocol_environment/sigs/v8/dal.mli +++ b/src/lib_protocol_environment/sigs/v8/dal.mli @@ -34,6 +34,9 @@ type parameters = { number_of_shards : int; } +(** An encoding for values of type {!parameters}. *) +val parameters_encoding : parameters Data_encoding.t + (** [make] precomputes the set of values needed by cryptographic primitives defined in this module and store them in a value of type [t] *) val make : parameters -> (t, [> `Fail of string]) result -- GitLab From 3af3c30a81d24c49e94218d3cf2aceb91007d565 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 6 Oct 2022 13:37:32 +0200 Subject: [PATCH 3/3] Proto: refactor Dal parameters --- .../bin_sc_rollup_node/dal_slots_tracker.ml | 6 +- .../lib_dal/dal_plugin_registration.ml | 8 +-- .../lib_parameters/default_parameters.ml | 26 ++++++--- .../lib_protocol/alpha_context.mli | 14 +++-- .../lib_protocol/constants_parametric_repr.ml | 57 +++++++------------ .../constants_parametric_repr.mli | 5 +- src/proto_alpha/lib_protocol/dal_slot_repr.ml | 2 + .../lib_protocol/dal_slot_repr.mli | 3 + src/proto_alpha/lib_protocol/raw_context.ml | 20 +++++-- ...t) RPC regression tests- misc_protocol.out | 9 ++- ...t) RPC regression tests- misc_protocol.out | 9 ++- ...y) RPC regression tests- misc_protocol.out | 9 ++- ...r) RPC regression tests- misc_protocol.out | 9 ++- ...c) RPC regression tests- misc_protocol.out | 9 ++- ...ing of commitments (no_commitment_publ.out | 18 +++--- ...handling of commitments (no_commitment.out | 18 +++--- 16 files changed, 107 insertions(+), 115 deletions(-) diff --git a/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.ml b/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.ml index 9ebe166581e0..c0f4ba7cbce3 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.ml +++ b/src/proto_alpha/bin_sc_rollup_node/dal_slots_tracker.ml @@ -229,10 +229,8 @@ let download_and_save_slots @@ to_slot_index_list protocol_constants.parametric @@ Bitset.inter subscribed_slots_indexes confirmed_slots_indexes in - let number_of_pages = - protocol_constants.parametric.dal.slot_size - / protocol_constants.parametric.dal.page_size - in + let params = protocol_constants.parametric.dal.cryptobox_parameters in + let number_of_pages = params.slot_size / params.page_size in (* DAL/FIXME: https://gitlab.com/tezos/tezos/-/issues/2766. As part of the clean rollup storage workflow, we should make sure that pages for old slots are removed from the storage when not needed anymore. diff --git a/src/proto_alpha/lib_dal/dal_plugin_registration.ml b/src/proto_alpha/lib_dal/dal_plugin_registration.ml index ebcf861ab312..b04a04ed66c2 100644 --- a/src/proto_alpha/lib_dal/dal_plugin_registration.ml +++ b/src/proto_alpha/lib_dal/dal_plugin_registration.ml @@ -30,13 +30,7 @@ module Plugin = struct let cpctxt = new Protocol_client_context.wrap_full ctxt in let open Lwt_result_syntax in let* constants = Protocol.Constants_services.all cpctxt (chain, block) in - let Protocol.Alpha_context.Constants.Parametric. - {redundancy_factor; page_size; slot_size; number_of_shards; _} = - constants.parametric.dal - in - return - Environment.Dal. - {redundancy_factor; page_size; slot_size; number_of_shards} + return constants.parametric.dal.cryptobox_parameters let get_published_slot_headers block ctxt = let open Lwt_result_syntax in diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 884ed4c287a0..42a0370eb1dc 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -58,17 +58,22 @@ let sc_rollup_timeout_period_in_blocks = 20_160 (* DAL/FIXME https://gitlab.com/tezos/tezos/-/issues/3177 Think harder about those values. *) +let default_cryptobox_parameters = + { + Dal.Slots_history.page_size = 4096; + slot_size = 1 lsl 20; + redundancy_factor = 16; + number_of_shards = 2048; + } + let default_dal = Constants.Parametric. { feature_enable = false; number_of_slots = 256; - number_of_shards = 2048; endorsement_lag = 1; availability_threshold = 50; - slot_size = 1 lsl 20; - redundancy_factor = 16; - page_size = 4096; + cryptobox_parameters = default_cryptobox_parameters; } let constants_mainnet = @@ -246,17 +251,22 @@ let constants_mainnet = }; } +let default_cryptobox_parameters_sandbox = + { + Dal.Slots_history.page_size = 4096; + number_of_shards = 256; + slot_size = 1 lsl 16; + redundancy_factor = 4; + } + let default_dal_sandbox = Constants.Parametric. { feature_enable = false; number_of_slots = 16; - number_of_shards = 256; endorsement_lag = 1; availability_threshold = 50; - slot_size = 1 lsl 16; - redundancy_factor = 4; - page_size = 4096; + cryptobox_parameters = default_cryptobox_parameters_sandbox; } let constants_sandbox = diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 403dfb77e115..c541736fe99e 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -773,12 +773,9 @@ module Constants : sig type dal = { feature_enable : bool; number_of_slots : int; - number_of_shards : int; endorsement_lag : int; availability_threshold : int; - slot_size : int; - redundancy_factor : int; - page_size : int; + cryptobox_parameters : Dal.parameters; } val dal_encoding : dal Data_encoding.t @@ -2880,6 +2877,15 @@ module Dal : sig val add_confirmed_slots : t -> History_cache.t -> Slot.t list -> (t * History_cache.t) tzresult + + type dal_parameters = Dal.parameters = { + redundancy_factor : int; + page_size : int; + slot_size : int; + number_of_shards : int; + } + + type proof end module Slots_storage : sig diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml index 7f009a5d9a47..4d560408d38e 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml @@ -28,12 +28,9 @@ type dal = { feature_enable : bool; number_of_slots : int; - number_of_shards : int; endorsement_lag : int; availability_threshold : int; - slot_size : int; - redundancy_factor : int; - page_size : int; + cryptobox_parameters : Dal.parameters; } let dal_encoding = @@ -42,48 +39,34 @@ let dal_encoding = (fun { feature_enable; number_of_slots; - number_of_shards; endorsement_lag; availability_threshold; - slot_size; - redundancy_factor; - page_size; + cryptobox_parameters; } -> - ( feature_enable, - number_of_slots, - number_of_shards, - endorsement_lag, - availability_threshold, - slot_size, - redundancy_factor, - page_size )) - (fun ( feature_enable, - number_of_slots, - number_of_shards, - endorsement_lag, - availability_threshold, - slot_size, - redundancy_factor, - page_size ) -> + ( ( feature_enable, + number_of_slots, + endorsement_lag, + availability_threshold ), + cryptobox_parameters )) + (fun ( ( feature_enable, + number_of_slots, + endorsement_lag, + availability_threshold ), + cryptobox_parameters ) -> { feature_enable; number_of_slots; - number_of_shards; endorsement_lag; availability_threshold; - slot_size; - redundancy_factor; - page_size; + cryptobox_parameters; }) - (obj8 - (req "feature_enable" Data_encoding.bool) - (req "number_of_slots" Data_encoding.int16) - (req "number_of_shards" Data_encoding.int16) - (req "endorsement_lag" Data_encoding.int16) - (req "availability_threshold" Data_encoding.int16) - (req "slot_size" Data_encoding.int31) - (req "redundancy_factor" Data_encoding.uint8) - (req "page_size" Data_encoding.uint16)) + (merge_objs + (obj4 + (req "feature_enable" bool) + (req "number_of_slots" int16) + (req "endorsement_lag" int16) + (req "availability_threshold" int16)) + Dal.parameters_encoding) (* The encoded representation of this type is stored in the context as bytes. Changing the encoding, or the value of these constants from diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli index db5c1c5ab07a..acdaf51831a9 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli @@ -28,12 +28,9 @@ type dal = { feature_enable : bool; number_of_slots : int; - number_of_shards : int; endorsement_lag : int; availability_threshold : int; - slot_size : int; - redundancy_factor : int; - page_size : int; + cryptobox_parameters : Dal.parameters; } val dal_encoding : dal Data_encoding.t diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.ml b/src/proto_alpha/lib_protocol/dal_slot_repr.ml index dcbfb2cc04b1..a93cac460285 100644 --- a/src/proto_alpha/lib_protocol/dal_slot_repr.ml +++ b/src/proto_alpha/lib_protocol/dal_slot_repr.ml @@ -583,6 +583,8 @@ module Slots_history = struct number_of_shards : int; } + let dal_parameters_encoding = Dal.parameters_encoding + type error += Dal_proof_error of string let () = diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.mli b/src/proto_alpha/lib_protocol/dal_slot_repr.mli index 7cf1741eef99..457152ae74c6 100644 --- a/src/proto_alpha/lib_protocol/dal_slot_repr.mli +++ b/src/proto_alpha/lib_protocol/dal_slot_repr.mli @@ -256,6 +256,9 @@ module Slots_history : sig number_of_shards : int; } + (** An encoding for values of type {!dal_parameters}. *) + val dal_parameters_encoding : dal_parameters Data_encoding.t + (** [produce_proof dal_parameters page_id page_info slots_hist hist_cache] produces a proof that either: - there exists a confirmed slot in the skip list that contains diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 29ca7b93275d..00287df4a49f 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -939,17 +939,22 @@ let prepare_first_block ~level ~timestamp ctxt = sunset_level = c.tx_rollup.sunset_level; } in + let cryptobox_parameters = + { + Dal.page_size = 4096; + number_of_shards = 2048; + slot_size = 1 lsl 20; + redundancy_factor = 16; + } + in let dal = Constants_parametric_repr. { feature_enable = false; number_of_slots = 256; - number_of_shards = 2048; endorsement_lag = 1; availability_threshold = 50; - slot_size = 1 lsl 20; - redundancy_factor = 16; - page_size = 4096; + cryptobox_parameters; } in (* Inherit values that existed in previous protocol and haven't changed. @@ -1604,7 +1609,8 @@ module Dal = struct ctxt.back.constants.Constants_parametric_repr.dal.availability_threshold in let number_of_shards = - ctxt.back.constants.Constants_parametric_repr.dal.number_of_shards + ctxt.back.constants.Constants_parametric_repr.dal.cryptobox_parameters + .number_of_shards in Dal_endorsement_repr.Accountability.is_slot_available ctxt.back.dal_endorsement_slot_accountability @@ -1618,7 +1624,9 @@ module Dal = struct the end. However, it should be enough for a prototype. This has a very bad complexity too. *) let rec compute_shards ?(index = 0) ctxt ~endorser = - let max_shards = ctxt.back.constants.dal.number_of_shards in + let max_shards = + ctxt.back.constants.dal.cryptobox_parameters.number_of_shards + in Slot_repr.Map.fold_e (fun _ (consensus_key, power) (index, shards) -> let limit = Compare.Int.min (index + power) max_shards in 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 debdd020abbe..0d821cb17efa 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 @@ -44,11 +44,10 @@ "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", 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 903ef7d963f0..8d75a7227ef2 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 @@ -44,11 +44,10 @@ "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", 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 f35a822a65c7..2b1185ce6154 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 @@ -44,11 +44,10 @@ "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", 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 9c81a23ef36d..98be0002fe33 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 @@ -44,11 +44,10 @@ "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", 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 9c81a23ef36d..98be0002fe33 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 @@ -44,11 +44,10 @@ "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out index d02de18bb59c..d15c07e0db54 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out @@ -100,11 +100,10 @@ This sequence of operations was run: "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": true, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": true, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 1, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", @@ -211,11 +210,10 @@ This sequence of operations was run: "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": true, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": true, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 1, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out index 3e242a14d01e..324aaa88c3cc 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out @@ -100,11 +100,10 @@ This sequence of operations was run: "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": true, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": true, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 1, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", @@ -211,11 +210,10 @@ This sequence of operations was run: "tx_rollup_rejection_max_proof_size": 30000, "tx_rollup_sunset_level": 3473409, "dal_parametric": - { "feature_enable": false, "number_of_slots": 16, - "number_of_shards": 256, "endorsement_lag": 1, - "availability_threshold": 50, "slot_size": 65536, - "redundancy_factor": 4, "page_size": 4096 }, "sc_rollup_enable": true, - "sc_rollup_origination_size": 6314, + { "feature_enable": false, "number_of_slots": 16, "endorsement_lag": 1, + "availability_threshold": 50, "redundancy_factor": 4, + "page_size": 4096, "slot_size": 65536, "number_of_shards": 256 }, + "sc_rollup_enable": true, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 1, "sc_rollup_max_number_of_messages_per_commitment_period": 300000000, "sc_rollup_stake_amount": "10000000000", -- GitLab