From d74e716cd3dc9a87229cb4e411ff40ac6030d4a0 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Tue, 29 Oct 2024 14:20:55 +0100 Subject: [PATCH 1/6] Alpha: export Raw_level.sub --- src/proto_alpha/lib_protocol/alpha_context.ml | 2 -- src/proto_alpha/lib_protocol/alpha_context.mli | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.ml b/src/proto_alpha/lib_protocol/alpha_context.ml index 1aaa46be23d0..eeca09443756 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.ml +++ b/src/proto_alpha/lib_protocol/alpha_context.ml @@ -224,8 +224,6 @@ module Raw_level = struct module Internal_for_tests = struct let add = add - let sub = sub - let from_repr (level : raw_level) = level let to_repr (level : raw_level) = level diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 394326c52df5..40770a13e7a9 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -263,6 +263,8 @@ module Raw_level : sig val of_int32_exn : int32 -> raw_level + val sub : raw_level -> int -> raw_level option + module Set : Set.S with type elt = raw_level module Map : Map.S with type key = raw_level @@ -270,8 +272,6 @@ module Raw_level : sig module Internal_for_tests : sig val add : raw_level -> int -> raw_level - val sub : raw_level -> int -> raw_level option - val from_repr : Raw_level_repr.t -> raw_level val to_repr : raw_level -> Raw_level_repr.t -- GitLab From f3ef7b941b5ee2bc11bcb84d47fcb93033d1dcb2 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Sat, 30 Nov 2024 09:00:48 +0100 Subject: [PATCH 2/6] Alpha: expose Slot.of_int --- src/proto_alpha/lib_protocol/alpha_context.mli | 6 ++---- src/proto_alpha/lib_protocol/slot_repr.ml | 4 ---- src/proto_alpha/lib_protocol/slot_repr.mli | 4 ---- .../lib_protocol/test/helpers/operation_generator.ml | 4 +--- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 40770a13e7a9..173ba8c468cf 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -82,6 +82,8 @@ module Slot : sig val to_int : t -> int + val of_int : int -> t tzresult + val of_int_do_not_use_except_for_parameters : int -> t val encoding : t Data_encoding.encoding @@ -103,10 +105,6 @@ module Slot : sig module Map : Map.S with type key = t module Set : Set.S with type elt = t - - module Internal_for_tests : sig - val of_int : int -> t tzresult - end end (** This module re-exports definitions from {!Tez_repr}. *) diff --git a/src/proto_alpha/lib_protocol/slot_repr.ml b/src/proto_alpha/lib_protocol/slot_repr.ml index a8e9193120a6..60c2f5461149 100644 --- a/src/proto_alpha/lib_protocol/slot_repr.ml +++ b/src/proto_alpha/lib_protocol/slot_repr.ml @@ -115,7 +115,3 @@ module Range = struct let* acc = f init hi in loop ~acc ~next:(hi - 1) end - -module Internal_for_tests = struct - let of_int = of_int -end diff --git a/src/proto_alpha/lib_protocol/slot_repr.mli b/src/proto_alpha/lib_protocol/slot_repr.mli index 27b574b4f2ac..cccc2cf43130 100644 --- a/src/proto_alpha/lib_protocol/slot_repr.mli +++ b/src/proto_alpha/lib_protocol/slot_repr.mli @@ -115,7 +115,3 @@ module Range : sig val rev_fold_es : ('a -> slot -> 'a tzresult Lwt.t) -> 'a -> t -> 'a tzresult Lwt.t end - -module Internal_for_tests : sig - val of_int : int -> t tzresult -end diff --git a/src/proto_alpha/lib_protocol/test/helpers/operation_generator.ml b/src/proto_alpha/lib_protocol/test/helpers/operation_generator.ml index 587f3f109276..9983d8ba88eb 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/operation_generator.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/operation_generator.ml @@ -268,9 +268,7 @@ let random_shell : Tezos_base.Operation.shell_header QCheck2.Gen.t = let gen_slot = let open QCheck2.Gen in let+ i = small_nat in - match Slot.Internal_for_tests.of_int i with - | Ok slot -> slot - | Error _ -> assert false + match Slot.of_int i with Ok slot -> slot | Error _ -> assert false let gen_level = let open QCheck2.Gen in -- GitLab From 99ab32a3ecde1a3dc6f7defbe8b9b6e0cc700a57 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Tue, 24 Sep 2024 17:32:04 +0200 Subject: [PATCH 3/6] Alpha/DAL: add traps_fraction parameter --- src/lib_dal_node/dal_plugin.ml | 77 +++++++++++-------- src/lib_dal_node/dal_plugin.mli | 1 + .../lib_dal/dal_plugin_registration.ml | 2 + .../lib_dal/dal_plugin_registration.ml | 2 + .../lib_dal/dal_plugin_registration.ml | 2 + .../lib_parameters/default_parameters.ml | 1 + .../lib_protocol/alpha_context.mli | 1 + .../lib_protocol/constants_parametric_repr.ml | 18 ++++- .../constants_parametric_repr.mli | 1 + src/proto_alpha/lib_protocol/raw_context.ml | 3 + 10 files changed, 73 insertions(+), 35 deletions(-) diff --git a/src/lib_dal_node/dal_plugin.ml b/src/lib_dal_node/dal_plugin.ml index baf6b14a7a20..f0bcca8cd694 100644 --- a/src/lib_dal_node/dal_plugin.ml +++ b/src/lib_dal_node/dal_plugin.ml @@ -39,6 +39,7 @@ type proto_parameters = { number_of_slots : int; attestation_lag : int; attestation_threshold : int; + traps_fraction : Q.t; cryptobox_parameters : Cryptobox.Verifier.parameters; sc_rollup_challenge_window_in_blocks : int; commitment_period_in_blocks : int; @@ -46,6 +47,13 @@ type proto_parameters = { blocks_per_cycle : int32; } +let q_encoding = + Data_encoding.( + conv + (fun Q.{num; den} -> (num, den)) + (fun (num, den) -> Q.make num den) + (obj2 (req "numerator" z) (req "denominator" z))) + let proto_parameters_encoding : proto_parameters Data_encoding.t = let open Data_encoding in conv @@ -55,55 +63,62 @@ let proto_parameters_encoding : proto_parameters Data_encoding.t = number_of_slots; attestation_lag; attestation_threshold; + traps_fraction; cryptobox_parameters; sc_rollup_challenge_window_in_blocks; commitment_period_in_blocks; dal_attested_slots_validity_lag; blocks_per_cycle; } -> - ( feature_enable, - incentives_enable, - number_of_slots, - attestation_lag, - attestation_threshold, - cryptobox_parameters, - sc_rollup_challenge_window_in_blocks, - commitment_period_in_blocks, - dal_attested_slots_validity_lag, - blocks_per_cycle )) - (fun ( feature_enable, - incentives_enable, - number_of_slots, - attestation_lag, - attestation_threshold, - cryptobox_parameters, - sc_rollup_challenge_window_in_blocks, - commitment_period_in_blocks, - dal_attested_slots_validity_lag, - blocks_per_cycle ) -> + ( ( feature_enable, + incentives_enable, + number_of_slots, + attestation_lag, + attestation_threshold, + traps_fraction ), + ( cryptobox_parameters, + sc_rollup_challenge_window_in_blocks, + commitment_period_in_blocks, + dal_attested_slots_validity_lag, + blocks_per_cycle ) )) + (fun ( ( feature_enable, + incentives_enable, + number_of_slots, + attestation_lag, + attestation_threshold, + traps_fraction ), + ( cryptobox_parameters, + sc_rollup_challenge_window_in_blocks, + commitment_period_in_blocks, + dal_attested_slots_validity_lag, + blocks_per_cycle ) ) -> { feature_enable; incentives_enable; number_of_slots; attestation_lag; attestation_threshold; + traps_fraction; cryptobox_parameters; sc_rollup_challenge_window_in_blocks; commitment_period_in_blocks; dal_attested_slots_validity_lag; blocks_per_cycle; }) - (obj10 - (req "feature_enable" bool) - (req "incentives_enable" bool) - (req "number_of_slots" int31) - (req "attestation_lag" int31) - (req "attestation_threshold" int31) - (req "cryptobox_parameters" Cryptobox.Verifier.parameters_encoding) - (req "sc_rollup_challenge_window_in_blocks" int31) - (req "commitment_period_in_blocks" int31) - (req "dal_attested_slots_validity_lag" int31) - (req "blocks_per_cycle" int32)) + (merge_objs + (obj6 + (req "feature_enable" bool) + (req "incentives_enable" bool) + (req "number_of_slots" int31) + (req "attestation_lag" int31) + (req "attestation_threshold" int31) + (req "traps_fraction" q_encoding)) + (obj5 + (req "cryptobox_parameters" Cryptobox.Verifier.parameters_encoding) + (req "sc_rollup_challenge_window_in_blocks" int31) + (req "commitment_period_in_blocks" int31) + (req "dal_attested_slots_validity_lag" int31) + (req "blocks_per_cycle" int32))) module type T = sig module Proto : Registered_protocol.T diff --git a/src/lib_dal_node/dal_plugin.mli b/src/lib_dal_node/dal_plugin.mli index 02104357ae25..4bc7f0429ab2 100644 --- a/src/lib_dal_node/dal_plugin.mli +++ b/src/lib_dal_node/dal_plugin.mli @@ -48,6 +48,7 @@ type proto_parameters = { number_of_slots : int; attestation_lag : int; attestation_threshold : int; + traps_fraction : Q.t; cryptobox_parameters : Cryptobox.Verifier.parameters; sc_rollup_challenge_window_in_blocks : int; commitment_period_in_blocks : int; diff --git a/src/proto_020_PsParisC/lib_dal/dal_plugin_registration.ml b/src/proto_020_PsParisC/lib_dal/dal_plugin_registration.ml index 026ffa4da1d3..654898ba401f 100644 --- a/src/proto_020_PsParisC/lib_dal/dal_plugin_registration.ml +++ b/src/proto_020_PsParisC/lib_dal/dal_plugin_registration.ml @@ -59,6 +59,8 @@ module Plugin = struct number_of_slots; attestation_lag; attestation_threshold; + traps_fraction = Q.(1 // 1000); + (* not used in proto_020 *) cryptobox_parameters; sc_rollup_challenge_window_in_blocks = parametric.sc_rollup.challenge_window_in_blocks; diff --git a/src/proto_021_PsQuebec/lib_dal/dal_plugin_registration.ml b/src/proto_021_PsQuebec/lib_dal/dal_plugin_registration.ml index 026ffa4da1d3..9b752919c95b 100644 --- a/src/proto_021_PsQuebec/lib_dal/dal_plugin_registration.ml +++ b/src/proto_021_PsQuebec/lib_dal/dal_plugin_registration.ml @@ -59,6 +59,8 @@ module Plugin = struct number_of_slots; attestation_lag; attestation_threshold; + traps_fraction = Q.(1 // 1000); + (* not used in proto_021 *) cryptobox_parameters; sc_rollup_challenge_window_in_blocks = parametric.sc_rollup.challenge_window_in_blocks; diff --git a/src/proto_alpha/lib_dal/dal_plugin_registration.ml b/src/proto_alpha/lib_dal/dal_plugin_registration.ml index fcaa9588658f..104451287206 100644 --- a/src/proto_alpha/lib_dal/dal_plugin_registration.ml +++ b/src/proto_alpha/lib_dal/dal_plugin_registration.ml @@ -50,6 +50,7 @@ module Plugin = struct attestation_threshold; minimal_participation_ratio = _; rewards_ratio = _; + traps_fraction; cryptobox_parameters; } = parametric.dal @@ -61,6 +62,7 @@ module Plugin = struct number_of_slots; attestation_lag; attestation_threshold; + traps_fraction; cryptobox_parameters; sc_rollup_challenge_window_in_blocks = parametric.sc_rollup.challenge_window_in_blocks; diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index ea53d35a4b26..ea03102faac7 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -168,6 +168,7 @@ let default_dal = prime, and (a+1, b+1) are relatively prime as well. The value x = 63% works as well. *) rewards_ratio = Q.zero; + traps_fraction = Q.(1 // 10000); } let constants_mainnet : Constants.Parametric.t = diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 173ba8c468cf..29b0403d65c8 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -834,6 +834,7 @@ module Constants : sig cryptobox_parameters : Dal.parameters; minimal_participation_ratio : Q.t; rewards_ratio : Q.t; + traps_fraction : Q.t; } type sc_rollup_reveal_hashing_schemes = {blake2B : Raw_level.t} diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml index df185bc7f9d3..ea2fc911eb38 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml @@ -54,6 +54,7 @@ type dal = { cryptobox_parameters : Dal.parameters; minimal_participation_ratio : Q.t; rewards_ratio : Q.t; + traps_fraction : Q.t; } let minimal_participation_ratio_encoding = @@ -65,6 +66,10 @@ let rewards_ratio_encoding = "dal.rewards_ratio must be a value between zero (inclusive) and one \ (exclusive)" +let traps_fraction_encoding = + between_zero_and_one_q_encoding + "traps_fraction must be a value between zero and one" + let dal_encoding = let open Data_encoding in conv @@ -77,6 +82,7 @@ let dal_encoding = cryptobox_parameters; minimal_participation_ratio; rewards_ratio; + traps_fraction; } -> ( ( feature_enable, incentives_enable, @@ -84,7 +90,8 @@ let dal_encoding = attestation_lag, attestation_threshold, minimal_participation_ratio, - rewards_ratio ), + rewards_ratio, + traps_fraction ), cryptobox_parameters )) (fun ( ( feature_enable, incentives_enable, @@ -92,7 +99,8 @@ let dal_encoding = attestation_lag, attestation_threshold, minimal_participation_ratio, - rewards_ratio ), + rewards_ratio, + traps_fraction ), cryptobox_parameters ) -> { feature_enable; @@ -103,9 +111,10 @@ let dal_encoding = cryptobox_parameters; minimal_participation_ratio; rewards_ratio; + traps_fraction; }) (merge_objs - (obj7 + (obj8 (req "feature_enable" bool) (req "incentives_enable" bool) (req "number_of_slots" uint16) @@ -114,7 +123,8 @@ let dal_encoding = (req "minimal_participation_ratio" minimal_participation_ratio_encoding) - (req "rewards_ratio" rewards_ratio_encoding)) + (req "rewards_ratio" rewards_ratio_encoding) + (req "traps_fraction" traps_fraction_encoding)) Dal.parameters_encoding) (* The encoded representation of this type is stored in the context as diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli index ba9fc9465bd8..1de95bed238c 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli @@ -81,6 +81,7 @@ type dal = { (* the ratio of the protocol-attested slots that need to be attested by an attester in order to receive rewards *) rewards_ratio : Q.t; (* the ratio of DAL rewards versus total rewards *) + traps_fraction : Q.t; (* probability that a given shard is a trap *) } val dal_encoding : dal Data_encoding.t diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index f1908988c87e..86865664f0d1 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1016,6 +1016,7 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = cryptobox_parameters; minimal_participation_ratio; rewards_ratio; + traps_fraction; } : Previous.dal) = c.dal @@ -1029,6 +1030,7 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = cryptobox_parameters; minimal_participation_ratio; rewards_ratio; + traps_fraction; } in let reveal_activation_level = @@ -1316,6 +1318,7 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = cryptobox_parameters; minimal_participation_ratio = Q.(64 // 100); rewards_ratio = Q.zero; + traps_fraction = Q.(1 // 10000); } in let reveal_activation_level = -- GitLab From 465a4c73ffd0361579ad0793a52b37044a5c0661 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Fri, 4 Oct 2024 11:23:25 +0200 Subject: [PATCH 4/6] Alpha/DAL: store slot headers for longer --- .../lib_protocol/dal_slot_storage.ml | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_protocol/dal_slot_storage.ml b/src/proto_alpha/lib_protocol/dal_slot_storage.ml index 4b30e6bc0417..4c3f70fc2f05 100644 --- a/src/proto_alpha/lib_protocol/dal_slot_storage.ml +++ b/src/proto_alpha/lib_protocol/dal_slot_storage.ml @@ -111,6 +111,25 @@ let update_number_of_attested_slots ctxt num_attested_slots = ctxt Int32.(add v (of_int num_attested_slots))) +(* TODO https://gitlab.com/tezos/tezos/-/issues/7647 + Consider if it is better to store commitments only for attestation lag + levels, by: + - either reducing the slashing period, + - or adding commitments to accusations and using the skip list to check if + the commitment was published. +*) +(* Commitments need to be stored for as long as a DAL entrapment evidence can be + successfully emitted for a given published level. *) +let remove_old_headers ctxt ~published_level = + let open Lwt_syntax in + let denunciation_period = + Constants_repr.max_slashing_period + * (Int32.to_int @@ Constants_storage.blocks_per_cycle ctxt) + in + match Raw_level_repr.(sub published_level denunciation_period) with + | None -> return ctxt + | Some level -> Storage.Dal.Slot.Headers.remove ctxt level + let finalize_pending_slot_headers ctxt ~number_of_slots = let open Lwt_result_syntax in let {Level_repr.level = raw_level; _} = Raw_context.current_level ctxt in @@ -119,7 +138,7 @@ let finalize_pending_slot_headers ctxt ~number_of_slots = | None -> return (ctxt, Dal_attestation_repr.empty) | Some published_level -> let* published_slots = find_slot_headers ctxt published_level in - let*! ctxt = Storage.Dal.Slot.Headers.remove ctxt published_level in + let*! ctxt = remove_old_headers ctxt ~published_level in let* ctxt, attestation, slot_headers_statuses = match published_slots with | None -> return (ctxt, Dal_attestation_repr.empty, []) -- GitLab From 25295da295b6a0b6f243dd554d55ba601538e4e4 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Wed, 18 Dec 2024 12:57:54 +0100 Subject: [PATCH 5/6] Kaitai: update struct files --- .../kaitai-struct-files/files/alpha__constants.ksy | 8 ++++++++ .../files/alpha__constants__parametric.ksy | 8 ++++++++ .../kaitai-struct-files/files/alpha__parameters.ksy | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/client-libs/kaitai-struct-files/files/alpha__constants.ksy b/client-libs/kaitai-struct-files/files/alpha__constants.ksy index fa3e60c267a1..e717bc45cbc9 100644 --- a/client-libs/kaitai-struct-files/files/alpha__constants.ksy +++ b/client-libs/kaitai-struct-files/files/alpha__constants.ksy @@ -53,6 +53,8 @@ types: type: minimal_participation_ratio_0 - id: rewards_ratio type: rewards_ratio + - id: traps_fraction + type: traps_fraction - id: redundancy_factor type: u1 - id: page_size @@ -179,6 +181,12 @@ types: type: s4be - id: dal_attested_slots_validity_lag type: int31 + traps_fraction: + seq: + - id: numerator + type: z + - id: denominator + type: z z: seq: - id: has_tail diff --git a/client-libs/kaitai-struct-files/files/alpha__constants__parametric.ksy b/client-libs/kaitai-struct-files/files/alpha__constants__parametric.ksy index 4cf850e574bf..2818febe112c 100644 --- a/client-libs/kaitai-struct-files/files/alpha__constants__parametric.ksy +++ b/client-libs/kaitai-struct-files/files/alpha__constants__parametric.ksy @@ -53,6 +53,8 @@ types: type: minimal_participation_ratio_0 - id: rewards_ratio type: rewards_ratio + - id: traps_fraction + type: traps_fraction - id: redundancy_factor type: u1 - id: page_size @@ -179,6 +181,12 @@ types: type: s4be - id: dal_attested_slots_validity_lag type: int31 + traps_fraction: + seq: + - id: numerator + type: z + - id: denominator + type: z z: seq: - id: has_tail diff --git a/client-libs/kaitai-struct-files/files/alpha__parameters.ksy b/client-libs/kaitai-struct-files/files/alpha__parameters.ksy index 26c0c8d1e0db..22fafee12855 100644 --- a/client-libs/kaitai-struct-files/files/alpha__parameters.ksy +++ b/client-libs/kaitai-struct-files/files/alpha__parameters.ksy @@ -187,6 +187,8 @@ types: type: minimal_participation_ratio_0 - id: rewards_ratio type: rewards_ratio + - id: traps_fraction + type: traps_fraction - id: redundancy_factor type: u1 - id: page_size @@ -403,6 +405,12 @@ types: type: s4be - id: dal_attested_slots_validity_lag type: int31 + traps_fraction: + seq: + - id: numerator + type: z + - id: denominator + type: z whitelist: seq: - id: whitelist_entries -- GitLab From 4d56593023098c24d7aace3c77306d6967f641dc Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Wed, 18 Dec 2024 20:20:05 +0100 Subject: [PATCH 6/6] Tests: update support files for new constant --- ...pha- (mode client) RPC regression tests- misc_protocol.out | 1 + ...lpha- (mode light) RPC regression tests- misc_protocol.out | 1 + ...lpha- (mode proxy) RPC regression tests- misc_protocol.out | 1 + .../weeklynet.ml/Alpha- weeklynet regression test.out | 1 + tezt/tests/weeklynet_configs/alpha.json | 4 ++++ 5 files changed, 8 insertions(+) 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 3ce2ae05f726..fe2c68d86991 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,6 +44,7 @@ "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "traps_fraction": { "numerator": "1", "denominator": "10000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 256 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 8cc910068813..46f21966f346 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,6 +44,7 @@ "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "traps_fraction": { "numerator": "1", "denominator": "10000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 256 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, 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 9357c63b96dd..8bf61e7e78f0 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,6 +44,7 @@ "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "traps_fraction": { "numerator": "1", "denominator": "10000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 256 }, "smart_rollup_arith_pvm_enable": false, "smart_rollup_origination_size": 6314, diff --git a/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out b/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out index 1a02ce50d413..4bd46e02ec3d 100644 --- a/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out +++ b/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out @@ -34,6 +34,7 @@ "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "traps_fraction": { "numerator": "1", "denominator": "10000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 512 }, "smart_rollup_arith_pvm_enable": true, "smart_rollup_origination_size": 6314, diff --git a/tezt/tests/weeklynet_configs/alpha.json b/tezt/tests/weeklynet_configs/alpha.json index 2608351d76c0..79f3eb52f476 100644 --- a/tezt/tests/weeklynet_configs/alpha.json +++ b/tezt/tests/weeklynet_configs/alpha.json @@ -82,6 +82,10 @@ "numerator": "0", "denominator": "1" }, + "traps_fraction": { + "numerator": "1", + "denominator": "10000" + }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, -- GitLab