diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 83482eca7f54d9862a864b38c2b00ec0c84c805a..a5e3107c622cd4ba02c7b56880673f177877c9ce 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -212,6 +212,7 @@ let constants_mainnet = (let commitment_period_in_blocks = 30 in { enable = false; + arith_pvm_enable = false; (* The following value is chosen to prevent spam. *) origination_size = 6_314; challenge_window_in_blocks = sc_rollup_challenge_window_in_blocks; diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index ef958f6486d491acabeedf05dd0a984cd3a09ed7..f8b97397c6b597fcd3fc720feee21c99beda5f78 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -820,6 +820,7 @@ module Constants : sig type sc_rollup = { enable : bool; + arith_pvm_enable : bool; origination_size : int; challenge_window_in_blocks : int; stake_amount : Tez.t; @@ -1004,6 +1005,8 @@ module Constants : sig val sc_rollup_enable : context -> bool + val sc_rollup_arith_pvm_enable : context -> bool + val dal_enable : context -> bool val sc_rollup_origination_size : context -> int @@ -3660,6 +3663,8 @@ module Sc_rollup : sig val of_string : string -> t option val to_string : t -> string + + val equal : t -> t -> bool end module ArithPVM : sig diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml index 358b0efbb35caf7534d4d6af38745234d82a8763..b51d5bb329cbda6eebe2ed20f09ab2d6c7f1a976 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml @@ -103,6 +103,7 @@ type tx_rollup = { type sc_rollup = { enable : bool; + arith_pvm_enable : bool; origination_size : int; challenge_window_in_blocks : int; stake_amount : Tez_repr.t; @@ -244,31 +245,34 @@ let sc_rollup_encoding = conv (fun (c : sc_rollup) -> ( ( c.enable, + c.arith_pvm_enable, c.origination_size, c.challenge_window_in_blocks, c.stake_amount, c.commitment_period_in_blocks, c.max_lookahead_in_blocks, c.max_active_outbox_levels, - c.max_outbox_messages_per_level, - c.number_of_sections_in_dissection ), - ( c.timeout_period_in_blocks, + c.max_outbox_messages_per_level ), + ( c.number_of_sections_in_dissection, + c.timeout_period_in_blocks, c.max_number_of_stored_cemented_commitments, c.max_number_of_parallel_games ) )) (fun ( ( sc_rollup_enable, + sc_rollup_arith_pvm_enable, sc_rollup_origination_size, sc_rollup_challenge_window_in_blocks, sc_rollup_stake_amount, sc_rollup_commitment_period_in_blocks, sc_rollup_max_lookahead_in_blocks, sc_rollup_max_active_outbox_levels, - sc_rollup_max_outbox_messages_per_level, - sc_rollup_number_of_sections_in_dissection ), - ( sc_rollup_timeout_period_in_blocks, + sc_rollup_max_outbox_messages_per_level ), + ( sc_rollup_number_of_sections_in_dissection, + sc_rollup_timeout_period_in_blocks, sc_rollup_max_number_of_cemented_commitments, sc_rollup_max_number_of_parallel_games ) ) -> { enable = sc_rollup_enable; + arith_pvm_enable = sc_rollup_arith_pvm_enable; origination_size = sc_rollup_origination_size; challenge_window_in_blocks = sc_rollup_challenge_window_in_blocks; stake_amount = sc_rollup_stake_amount; @@ -286,15 +290,16 @@ let sc_rollup_encoding = (merge_objs (obj9 (req "sc_rollup_enable" bool) + (req "sc_rollup_arith_pvm_enable" bool) (req "sc_rollup_origination_size" int31) (req "sc_rollup_challenge_window_in_blocks" int31) (req "sc_rollup_stake_amount" Tez_repr.encoding) (req "sc_rollup_commitment_period_in_blocks" int31) (req "sc_rollup_max_lookahead_in_blocks" int32) (req "sc_rollup_max_active_outbox_levels" int32) - (req "sc_rollup_max_outbox_messages_per_level" int31) - (req "sc_rollup_number_of_sections_in_dissection" uint8)) - (obj3 + (req "sc_rollup_max_outbox_messages_per_level" int31)) + (obj4 + (req "sc_rollup_number_of_sections_in_dissection" uint8) (req "sc_rollup_timeout_period_in_blocks" int31) (req "sc_rollup_max_number_of_cemented_commitments" int31) (req "sc_rollup_max_number_of_parallel_games" int31))) diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli index 3033307a1ccd24b06b4bf8f8a3585484741cda14..c4688ec3cd20a7d393421bb4b1527d1fb1f38119 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli @@ -87,6 +87,7 @@ type tx_rollup = { type sc_rollup = { enable : bool; + arith_pvm_enable : bool; origination_size : int; challenge_window_in_blocks : int; stake_amount : Tez_repr.t; diff --git a/src/proto_alpha/lib_protocol/constants_storage.ml b/src/proto_alpha/lib_protocol/constants_storage.ml index 2bbd285e00c1ce9ad378117adb48378b4e388420..9717bda774a2c3a48ff297a1269fbee3e837f18b 100644 --- a/src/proto_alpha/lib_protocol/constants_storage.ml +++ b/src/proto_alpha/lib_protocol/constants_storage.ml @@ -226,6 +226,10 @@ let sc_rollup_enable c = let sc_rollup = Raw_context.sc_rollup c in sc_rollup.enable +let sc_rollup_arith_pvm_enable c = + let sc_rollup = Raw_context.sc_rollup c in + sc_rollup.arith_pvm_enable + let sc_rollup_origination_size c = let sc_rollup = Raw_context.sc_rollup c in sc_rollup.origination_size diff --git a/src/proto_alpha/lib_protocol/constants_storage.mli b/src/proto_alpha/lib_protocol/constants_storage.mli index a5d47a9143cda22fed186706fd764351e3d5f1b2..91860068b0d58a732d422ac6d5e26d653f36a61c 100644 --- a/src/proto_alpha/lib_protocol/constants_storage.mli +++ b/src/proto_alpha/lib_protocol/constants_storage.mli @@ -135,6 +135,8 @@ val delay_increment_per_round : Raw_context.t -> Period_repr.t val sc_rollup_enable : Raw_context.t -> bool +val sc_rollup_arith_pvm_enable : Raw_context.t -> bool + val sc_rollup_origination_size : Raw_context.t -> int val sc_rollup_challenge_window_in_blocks : Raw_context.t -> int diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 76c1f307bf6ffc0302dd72ede15f61dfbda3d76a..6129e213f44763ea4462509c66f972e8c501d27d 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1024,6 +1024,7 @@ let prepare_first_block ~level ~timestamp ctxt = Constants_parametric_repr. { enable = c.sc_rollup.enable; + arith_pvm_enable = false; origination_size = c.sc_rollup.origination_size; challenge_window_in_blocks = c.sc_rollup.challenge_window_in_blocks; (* TODO: https://gitlab.com/tezos/tezos/-/issues/2756 diff --git a/src/proto_alpha/lib_protocol/test/helpers/block.ml b/src/proto_alpha/lib_protocol/test/helpers/block.ml index 7a21da9f93bb44abd73d060505122376323fe214..7a0fed008e55a2475d27edd7bbaa076572836e5c 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/block.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/block.ml @@ -478,8 +478,8 @@ let prepare_initial_context_params ?consensus_threshold ?min_proposal_quorum ?baking_reward_bonus_per_slot ?baking_reward_fixed_portion ?origination_size ?blocks_per_cycle ?cycles_per_voting_period ?tx_rollup_enable ?tx_rollup_sunset_level ?tx_rollup_origination_size ?sc_rollup_enable - ?dal_enable ?zk_rollup_enable ?hard_gas_limit_per_block - ?nonce_revelation_threshold () = + ?sc_rollup_arith_pvm_enable ?dal_enable ?zk_rollup_enable + ?hard_gas_limit_per_block ?nonce_revelation_threshold () = let open Tezos_protocol_alpha_parameters in let constants = Default_parameters.constants_test in let min_proposal_quorum = @@ -538,6 +538,9 @@ let prepare_initial_context_params ?consensus_threshold ?min_proposal_quorum let sc_rollup_enable = Option.value ~default:constants.sc_rollup.enable sc_rollup_enable in + let sc_rollup_arith_pvm_enable = + Option.value ~default:constants.sc_rollup.enable sc_rollup_arith_pvm_enable + in let dal_enable = Option.value ~default:constants.dal.feature_enable dal_enable in @@ -574,7 +577,12 @@ let prepare_initial_context_params ?consensus_threshold ?min_proposal_quorum sunset_level = tx_rollup_sunset_level; origination_size = tx_rollup_origination_size; }; - sc_rollup = {constants.sc_rollup with enable = sc_rollup_enable}; + sc_rollup = + { + constants.sc_rollup with + enable = sc_rollup_enable; + arith_pvm_enable = sc_rollup_arith_pvm_enable; + }; dal = {constants.dal with feature_enable = dal_enable}; zk_rollup = {constants.zk_rollup with enable = zk_rollup_enable}; hard_gas_limit_per_block; @@ -611,8 +619,9 @@ let genesis ?commitments ?consensus_threshold ?min_proposal_quorum ?endorsing_reward_per_slot ?baking_reward_bonus_per_slot ?baking_reward_fixed_portion ?origination_size ?blocks_per_cycle ?cycles_per_voting_period ?tx_rollup_enable ?tx_rollup_sunset_level - ?tx_rollup_origination_size ?sc_rollup_enable ?dal_enable ?zk_rollup_enable - ?hard_gas_limit_per_block ?nonce_revelation_threshold + ?tx_rollup_origination_size ?sc_rollup_enable ?sc_rollup_arith_pvm_enable + ?dal_enable ?zk_rollup_enable ?hard_gas_limit_per_block + ?nonce_revelation_threshold (bootstrap_accounts : Parameters.bootstrap_account list) = prepare_initial_context_params ?consensus_threshold @@ -630,6 +639,7 @@ let genesis ?commitments ?consensus_threshold ?min_proposal_quorum ?tx_rollup_sunset_level ?tx_rollup_origination_size ?sc_rollup_enable + ?sc_rollup_arith_pvm_enable ?dal_enable ?zk_rollup_enable ?hard_gas_limit_per_block diff --git a/src/proto_alpha/lib_protocol/test/helpers/block.mli b/src/proto_alpha/lib_protocol/test/helpers/block.mli index fd8560a3c776108da61298888a79855a784717ea..80bd8fe6ad3585984b70b744872e3b0a5f2fda81 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/block.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/block.mli @@ -136,6 +136,7 @@ val genesis : ?tx_rollup_sunset_level:int32 -> ?tx_rollup_origination_size:int -> ?sc_rollup_enable:bool -> + ?sc_rollup_arith_pvm_enable:bool -> ?dal_enable:bool -> ?zk_rollup_enable:bool -> ?hard_gas_limit_per_block:Gas.Arith.integral -> @@ -297,6 +298,7 @@ val prepare_initial_context_params : ?tx_rollup_sunset_level:int32 -> ?tx_rollup_origination_size:int -> ?sc_rollup_enable:bool -> + ?sc_rollup_arith_pvm_enable:bool -> ?dal_enable:bool -> ?zk_rollup_enable:bool -> ?hard_gas_limit_per_block:Gas.Arith.integral -> diff --git a/src/proto_alpha/lib_protocol/test/helpers/context.ml b/src/proto_alpha/lib_protocol/test/helpers/context.ml index 546245ed53f6adafeebaa56feb179a2cd8e616ce..89f084216cf91d77766c5840c2cd39fdc2b27e42 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/context.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/context.ml @@ -479,8 +479,8 @@ let init_gen tup ?rng_state ?commitments ?bootstrap_balances ?baking_reward_bonus_per_slot ?baking_reward_fixed_portion ?origination_size ?blocks_per_cycle ?cycles_per_voting_period ?tx_rollup_enable ?tx_rollup_sunset_level ?tx_rollup_origination_size ?sc_rollup_enable - ?dal_enable ?zk_rollup_enable ?hard_gas_limit_per_block - ?nonce_revelation_threshold () = + ?sc_rollup_arith_pvm_enable ?dal_enable ?zk_rollup_enable + ?hard_gas_limit_per_block ?nonce_revelation_threshold () = let n = tup_n tup in Account.generate_accounts ?rng_state n >>?= fun accounts -> let contracts = @@ -511,6 +511,7 @@ let init_gen tup ?rng_state ?commitments ?bootstrap_balances ?tx_rollup_sunset_level ?tx_rollup_origination_size ?sc_rollup_enable + ?sc_rollup_arith_pvm_enable ?dal_enable ?zk_rollup_enable ?hard_gas_limit_per_block diff --git a/src/proto_alpha/lib_protocol/test/helpers/context.mli b/src/proto_alpha/lib_protocol/test/helpers/context.mli index d747ac65e6062cdcb93004428dcfb29feaabcc5e..220ce2301499b569dd3d7296cbd0622ffee4ed3e 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/context.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/context.mli @@ -312,6 +312,7 @@ type 'accounts init := ?tx_rollup_sunset_level:int32 -> ?tx_rollup_origination_size:int -> ?sc_rollup_enable:bool -> + ?sc_rollup_arith_pvm_enable:bool -> ?dal_enable:bool -> ?zk_rollup_enable:bool -> ?hard_gas_limit_per_block:Gas.Arith.integral -> diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_typechecking.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_typechecking.ml index 8136c612ccde4e16a89fbfffb2b09e84e50b0b62..1ed6240ac35418ad631dcbb3f8a1596d0389e86a 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_typechecking.ml +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_typechecking.ml @@ -44,7 +44,12 @@ let context_init_with_sc_rollup_enabled tup = { Context.default_test_constants with consensus_threshold = 0; - sc_rollup = {Context.default_test_constants.sc_rollup with enable = true}; + sc_rollup = + { + Context.default_test_constants.sc_rollup with + enable = true; + arith_pvm_enable = true; + }; } let sc_originate block contract parameters_ty = diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml index 4dc11a982a7fe3a2bf5729e7165ec6dc97e7434c..ba9c3d723e02c9fa249dc0e7c83dd363fb1838a2 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml +++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_sc_rollup.ml @@ -147,6 +147,7 @@ let context_init ?(sc_rollup_challenge_window_in_blocks = 10) { Context.default_test_constants.sc_rollup with enable = true; + arith_pvm_enable = true; challenge_window_in_blocks = sc_rollup_challenge_window_in_blocks; timeout_period_in_blocks; }; @@ -174,6 +175,30 @@ let test_disable_feature_flag () = let* (_ : Incremental.t) = Incremental.add_operation ~expect_failure i op in return_unit +(** [test_disable_arith_pvm_feature_flag ()] tries to originate a Arith smart + rollup when the Arith PVM feature flag is deactivated and checks that it + fails. *) +let test_disable_arith_pvm_feature_flag () = + let* b, contract = + Context.init1 ~sc_rollup_enable:true ~sc_rollup_arith_pvm_enable:false () + in + let* i = Incremental.begin_construction b in + let kind = Sc_rollup.Kind.Example_arith in + let* op, _ = + let parameters_ty = Script.lazy_expr @@ Expr.from_string "unit" in + Op.sc_rollup_origination (I i) contract kind ~boot_sector:"" ~parameters_ty + in + let expect_failure = function + | Environment.Ecoproto_error + (Validate_errors.Manager.Sc_rollup_arith_pvm_disabled as e) + :: _ -> + Assert.test_error_encodings e ; + return_unit + | _ -> failwith "It should have failed with [Sc_rollup_feature_disabled]" + in + let* (_ : Incremental.t) = Incremental.add_operation ~expect_failure i op in + return_unit + (** Initializes the context and originates a SCORU. *) let sc_originate ?(boot_sector = "") ?origination_proof block contract parameters_ty = @@ -2678,6 +2703,10 @@ let tests = "check effect of disabled feature flag" `Quick test_disable_feature_flag; + Tztest.tztest + "check effect of disabled arith pvm flag" + `Quick + test_disable_arith_pvm_feature_flag; Tztest.tztest "can publish a commit, cement it and withdraw stake" `Quick diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml b/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml index 84dba2078c289db828cd1b582a9d36e7e53ad626..d7df3984d6d397462976a80dcf18e7db9b2b2886 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml +++ b/src/proto_alpha/lib_protocol/test/integration/validate/manager_operation_helpers.ml @@ -451,7 +451,13 @@ let manager_parameters : Parameters.t -> ctxt_req -> Parameters.t = enable = flags.toru; } in - let sc_rollup = {params.constants.sc_rollup with enable = flags.scoru} in + let sc_rollup = + { + params.constants.sc_rollup with + enable = flags.scoru; + arith_pvm_enable = flags.scoru; + } + in let zk_rollup = {params.constants.zk_rollup with enable = flags.zkru} in let constants = { diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml b/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml index 27d7dc2aa28c8cc55712f9e2065c70b70b043b42..d79365e6e6fc505ee0f087838416172c4711137f 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml @@ -231,6 +231,7 @@ let create_ctxt () = let* block, (account1, account2, account3) = Context.init3 ~sc_rollup_enable:true + ~sc_rollup_arith_pvm_enable:true ~consensus_threshold:0 ~bootstrap_balances:[100_000_000_000L; 100_000_000_000L; 100_000_000_000L] () diff --git a/src/proto_alpha/lib_protocol/validate.ml b/src/proto_alpha/lib_protocol/validate.ml index f71bfb2d5685d1d574bcc25c91f5a222fcfd35da..48e6af5a0a074677e1983164ccec2ab47ec4409a 100644 --- a/src/proto_alpha/lib_protocol/validate.ml +++ b/src/proto_alpha/lib_protocol/validate.ml @@ -2228,6 +2228,12 @@ module Manager = struct let assert_sc_rollup_feature_enabled vi = error_unless (Constants.sc_rollup_enable vi.ctxt) Sc_rollup_feature_disabled + let assert_pvm_kind_enabled vi kind = + error_when + ((not (Constants.sc_rollup_arith_pvm_enable vi.ctxt)) + && Sc_rollup.Kind.(equal kind Example_arith)) + Sc_rollup_arith_pvm_disabled + let assert_not_zero_messages messages = match messages with | [] -> error Sc_rollup_errors.Sc_rollup_add_zero_messages @@ -2410,9 +2416,11 @@ module Manager = struct | Tx_rollup_dispatch_tickets _ -> validate_tx_rollup_dispatch_tickets vi remaining_gas operation | Tx_rollup_rejection _ -> validate_tx_rollup_rejection vi operation - | Sc_rollup_originate _ | Sc_rollup_cement _ | Sc_rollup_publish _ - | Sc_rollup_refute _ | Sc_rollup_timeout _ - | Sc_rollup_execute_outbox_message _ -> + | Sc_rollup_originate {kind; _} -> + let* () = assert_sc_rollup_feature_enabled vi in + assert_pvm_kind_enabled vi kind + | Sc_rollup_cement _ | Sc_rollup_publish _ | Sc_rollup_refute _ + | Sc_rollup_timeout _ | Sc_rollup_execute_outbox_message _ -> assert_sc_rollup_feature_enabled vi | Sc_rollup_add_messages {messages; _} -> let* () = assert_sc_rollup_feature_enabled vi in diff --git a/src/proto_alpha/lib_protocol/validate_errors.ml b/src/proto_alpha/lib_protocol/validate_errors.ml index efea3cb7c2fad3eae565c58bcfa9fa7bc0046db9..ed446b6910e00eff82ad500e9caa909a2e4d486b 100644 --- a/src/proto_alpha/lib_protocol/validate_errors.ml +++ b/src/proto_alpha/lib_protocol/validate_errors.ml @@ -1152,6 +1152,7 @@ module Manager = struct | Gas_quota_exceeded_init_deserialize | Tx_rollup_feature_disabled | Sc_rollup_feature_disabled + | Sc_rollup_arith_pvm_disabled | Zk_rollup_feature_disabled let () = @@ -1270,6 +1271,20 @@ module Manager = struct Data_encoding.unit (function Sc_rollup_feature_disabled -> Some () | _ -> None) (fun () -> Sc_rollup_feature_disabled) ; + + let scoru_arith_pvm_disabled_description = + "Arith PVM is disabled in this network." + in + register_error_kind + `Permanent + ~id:"operation.arith_pvm_disabled" + ~title:"The Arith PVM is disabled" + ~description:scoru_arith_pvm_disabled_description + ~pp:(fun ppf () -> + Format.fprintf ppf "%s" scoru_arith_pvm_disabled_description) + Data_encoding.unit + (function Sc_rollup_arith_pvm_disabled -> Some () | _ -> None) + (fun () -> Sc_rollup_arith_pvm_disabled) ; let zkru_disabled_description = "ZK rollups will be enabled in a future proposal." in diff --git a/src/proto_alpha/lib_protocol/validate_errors.mli b/src/proto_alpha/lib_protocol/validate_errors.mli index 4fac7b0195dcafbdf734a4f164b6b1a40f4964eb..e26eafc0bba629397c473606a46476541a045e62 100644 --- a/src/proto_alpha/lib_protocol/validate_errors.mli +++ b/src/proto_alpha/lib_protocol/validate_errors.mli @@ -198,6 +198,7 @@ module Manager : sig | Gas_quota_exceeded_init_deserialize | Tx_rollup_feature_disabled | Sc_rollup_feature_disabled + | Sc_rollup_arith_pvm_disabled | Zk_rollup_feature_disabled end diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml index c322d39414c7483f8863c22fc3632ab81b29dee4..b02bfe5bb0f7c326678c86433767631eae576561 100644 --- a/tezt/tests/dal.ml +++ b/tezt/tests/dal.ml @@ -122,7 +122,10 @@ let with_layer1 ?additional_bootstrap_accounts ?(attestation_lag = 1) (* this will produce the empty list if dal_enable is not passed to the function invocation, hence the value from the protocol constants will be used. *) @ dal_enable_param dal_enable - @ [(["sc_rollup_enable"], `Bool true)] + @ [ + (["sc_rollup_enable"], `Bool true); + (["sc_rollup_arith_pvm_enable"], `Bool true); + ] in let* node, client, dal_parameters = setup_node 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 9d08d090d32438bf1a22be2ed8efbf65da54da17..00defb85257b97160fe69af34f012fefbb34a588 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 @@ -49,7 +49,7 @@ "availability_threshold": 50, "blocks_per_epoch": 2, "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, "number_of_shards": 64 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + "sc_rollup_arith_pvm_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_stake_amount": "10000000000", "sc_rollup_commitment_period_in_blocks": 30, 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 e6c8065c9c7c8ad25e226dab3fe598f0a1b6432a..5ffb140b50bce60c24ab6941db4bb11ab12a5fc9 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 @@ -49,7 +49,7 @@ "availability_threshold": 50, "blocks_per_epoch": 2, "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, "number_of_shards": 64 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + "sc_rollup_arith_pvm_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_stake_amount": "10000000000", "sc_rollup_commitment_period_in_blocks": 30, 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 9b82962e3885058ac6cd7bfaa6f82bd8fe159914..1c5d026cd9b40a26d7b3f2a632ec57ec936a9cef 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 @@ -49,7 +49,7 @@ "availability_threshold": 50, "blocks_per_epoch": 2, "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, "number_of_shards": 64 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + "sc_rollup_arith_pvm_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_stake_amount": "10000000000", "sc_rollup_commitment_period_in_blocks": 30, 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 be21cf399c085c035881a94c42537d688473c61f..d257ff8291028efe6adaac38b68fc45a38bf290a 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 @@ -49,7 +49,7 @@ "availability_threshold": 50, "blocks_per_epoch": 2, "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, "number_of_shards": 64 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + "sc_rollup_arith_pvm_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_stake_amount": "10000000000", "sc_rollup_commitment_period_in_blocks": 30, 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 be21cf399c085c035881a94c42537d688473c61f..d257ff8291028efe6adaac38b68fc45a38bf290a 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 @@ -49,7 +49,7 @@ "availability_threshold": 50, "blocks_per_epoch": 2, "redundancy_factor": 8, "page_size": 128, "slot_size": 32768, "number_of_shards": 64 }, "sc_rollup_enable": false, - "sc_rollup_origination_size": 6314, + "sc_rollup_arith_pvm_enable": false, "sc_rollup_origination_size": 6314, "sc_rollup_challenge_window_in_blocks": 20160, "sc_rollup_stake_amount": "10000000000", "sc_rollup_commitment_period_in_blocks": 30, diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index 12dee24aec57caa948c1e9c71fb1bd7d09f716b8..6033c2e74a0e4d8abfcd1eb966d5e1c97c8b8169 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -156,7 +156,10 @@ let setup_l1 ?commitment_period ?challenge_window ?timeout protocol = make_parameter "sc_rollup_commitment_period_in_blocks" commitment_period @ make_parameter "sc_rollup_challenge_window_in_blocks" challenge_window @ make_parameter "sc_rollup_timeout_period_in_blocks" timeout - @ [(["sc_rollup_enable"], `Bool true)] + @ [ + (["sc_rollup_enable"], `Bool true); + (["sc_rollup_arith_pvm_enable"], `Bool true); + ] in let base = Either.right (protocol, None) in let* parameter_file = Protocol.write_parameter_file ~base parameters in