From 223398c7ae28d2e02d25a4672994058de42c4f6a Mon Sep 17 00:00:00 2001 From: Mehdi Bouaziz Date: Tue, 10 Oct 2023 16:38:14 +0200 Subject: [PATCH] Proto: do not migrate max_bonus Partly reverts 8682bb3fc30523be9dd0a375e62adc80a885c347 and bc55a7410aed1045cb568170b32d219734ff7b50 from !10107 --- src/proto_alpha/lib_protocol/issuance_bonus_repr.ml | 6 ------ src/proto_alpha/lib_protocol/issuance_bonus_repr.mli | 2 -- src/proto_alpha/lib_protocol/raw_context.ml | 5 ++--- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/proto_alpha/lib_protocol/issuance_bonus_repr.ml b/src/proto_alpha/lib_protocol/issuance_bonus_repr.ml index 231d35277f35..204138251752 100644 --- a/src/proto_alpha/lib_protocol/issuance_bonus_repr.ml +++ b/src/proto_alpha/lib_protocol/issuance_bonus_repr.ml @@ -64,9 +64,3 @@ let max_bonus_parameter_of_Q_exn q = | Some max_bonus -> max_bonus | None -> failwith "Invalid parameter: max_bonus parameter must be between 0 and 1" - -let migrate_max_bonus_from_O_to_P i = - let open Result_syntax in - match of_int64_repr i with - | Some max_bonus -> return max_bonus - | None -> tzfail Out_of_bounds_bonus diff --git a/src/proto_alpha/lib_protocol/issuance_bonus_repr.mli b/src/proto_alpha/lib_protocol/issuance_bonus_repr.mli index e54f1b1ef86f..e45bf1727a25 100644 --- a/src/proto_alpha/lib_protocol/issuance_bonus_repr.mli +++ b/src/proto_alpha/lib_protocol/issuance_bonus_repr.mli @@ -36,5 +36,3 @@ val of_Q : max_bonus:max_bonus -> Q.t -> t tzresult (** Use only to define the [max_bonus] parameter from [Default_parameters]. *) val max_bonus_parameter_of_Q_exn : Q.t -> max_bonus - -val migrate_max_bonus_from_O_to_P : int64 -> max_bonus tzresult diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 45db85c3670c..1dc5c62ec51a 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -967,9 +967,8 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = return result | Oxford_018 -> let*! c = get_previous_protocol_constants ctxt in - let*? max_bonus = - Issuance_bonus_repr.migrate_max_bonus_from_O_to_P - c.adaptive_issuance.adaptive_rewards_params.max_bonus + let max_bonus = + Issuance_bonus_repr.max_bonus_parameter_of_Q_exn Q.(5 // 100) in let cryptobox_parameters = -- GitLab