From 2e329408190f896e252021be02ec83aab04c6e0d Mon Sep 17 00:00:00 2001 From: Marina Polubelova Date: Fri, 16 Feb 2024 09:56:53 +0100 Subject: [PATCH 1/4] proto: make liquidity baking subsidy independent of issuance We also remove 5 tez from base_total_issued_per_minute for liquidity_baking_subsidy. --- .../lib_parameters/default_parameters.ml | 6 ++-- .../adaptive_issuance_services.ml | 14 +-------- .../adaptive_issuance_services.mli | 1 - .../lib_protocol/alpha_context.mli | 6 ++-- .../lib_protocol/constants_parametric_repr.ml | 15 +++++----- .../constants_parametric_repr.mli | 2 +- .../lib_protocol/constants_repr.ml | 7 ++--- .../lib_protocol/delegate_rewards.ml | 19 ++++++++---- .../lib_protocol/delegate_rewards.mli | 4 ++- src/proto_alpha/lib_protocol/raw_context.ml | 14 +++++++-- .../lib_protocol/test/helpers/context.ml | 4 +-- .../test/helpers/liquidity_baking_machine.ml | 30 ++----------------- .../test/integration/consensus/test_seed.ml | 1 - .../integration/operations/test_voting.ml | 1 - .../test_adaptive_issuance_roundtrip.ml | 3 +- .../test/integration/test_constants.ml | 4 ++- 16 files changed, 52 insertions(+), 79 deletions(-) diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 014bfb59d9c8..c582c1fb3631 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -161,7 +161,6 @@ let constants_mainnet : Constants.Parametric.t = baking_reward_fixed_portion_weight; baking_reward_bonus_weight; attesting_reward_weight; - liquidity_baking_subsidy_weight; seed_nonce_revelation_tip_weight; vdf_revelation_tip_weight; }; @@ -221,15 +220,13 @@ let constants_mainnet : Constants.Parametric.t = issuance_weights = { base_total_issued_per_minute; - (* 85.007812 tez/minute *) + (* 80.007812 tez/minute *) baking_reward_fixed_portion_weight; (* 1/4th of total block rewards *) baking_reward_bonus_weight; (* all bonus rewards = fixed rewards *) attesting_reward_weight; (* all baking rewards = all attesting rewards *) - liquidity_baking_subsidy_weight; - (* 1/16th of block rewards *) seed_nonce_revelation_tip_weight; (* 1/20480 of block rewards *) vdf_revelation_tip_weight; @@ -240,6 +237,7 @@ let constants_mainnet : Constants.Parametric.t = quorum_min = 20_00l; quorum_max = 70_00l; min_proposal_quorum = 5_00l; + liquidity_baking_subsidy = Tez.(mul_exn one 5); (* 1/2 window size of 2000 blocks with precision of 1_000_000 for integer computation *) liquidity_baking_toggle_ema_threshold = 1_000_000_000l; diff --git a/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml b/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml index 7477b06ace46..36885d778f81 100644 --- a/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml +++ b/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml @@ -30,7 +30,6 @@ type expected_rewards = { baking_reward_fixed_portion : Tez.t; baking_reward_bonus_per_slot : Tez.t; attesting_reward_per_slot : Tez.t; - liquidity_baking_subsidy : Tez.t; seed_nonce_revelation_tip : Tez.t; vdf_revelation_tip : Tez.t; } @@ -43,7 +42,6 @@ let expected_rewards_encoding : expected_rewards Data_encoding.t = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; - liquidity_baking_subsidy; seed_nonce_revelation_tip; vdf_revelation_tip; } -> @@ -51,14 +49,12 @@ let expected_rewards_encoding : expected_rewards Data_encoding.t = baking_reward_fixed_portion, baking_reward_bonus_per_slot, attesting_reward_per_slot, - liquidity_baking_subsidy, seed_nonce_revelation_tip, vdf_revelation_tip )) (fun ( cycle, baking_reward_fixed_portion, baking_reward_bonus_per_slot, attesting_reward_per_slot, - liquidity_baking_subsidy, seed_nonce_revelation_tip, vdf_revelation_tip ) -> { @@ -66,16 +62,14 @@ let expected_rewards_encoding : expected_rewards Data_encoding.t = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; - liquidity_baking_subsidy; seed_nonce_revelation_tip; vdf_revelation_tip; }) - (obj7 + (obj6 (req "cycle" Cycle.encoding) (req "baking_reward_fixed_portion" Tez.encoding) (req "baking_reward_bonus_per_slot" Tez.encoding) (req "attesting_reward_per_slot" Tez.encoding) - (req "liquidity_baking_subsidy" Tez.encoding) (req "seed_nonce_revelation_tip" Tez.encoding) (req "vdf_revelation_tip" Tez.encoding)) @@ -205,7 +199,6 @@ let collect_expected_rewards ~ctxt = let*? baking_reward_fixed_portion = baking_reward_fixed_portion ctxt in let*? baking_reward_bonus_per_slot = baking_reward_bonus_per_slot ctxt in let*? attesting_reward_per_slot = attesting_reward_per_slot ctxt in - let*? liquidity_baking_subsidy = liquidity_baking_subsidy ctxt in let*? seed_nonce_revelation_tip = seed_nonce_revelation_tip ctxt in let*? vdf_revelation_tip = vdf_revelation_tip ctxt in return @@ -214,7 +207,6 @@ let collect_expected_rewards ~ctxt = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; - liquidity_baking_subsidy; seed_nonce_revelation_tip; vdf_revelation_tip; } @@ -240,9 +232,6 @@ let collect_expected_rewards ~ctxt = let*? attesting_reward_per_slot = reward_from_constants ~coeff csts ~reward_kind:Attesting_reward_per_slot in - let*? liquidity_baking_subsidy = - reward_from_constants ~coeff csts ~reward_kind:Liquidity_baking_subsidy - in let*? seed_nonce_revelation_tip = reward_from_constants ~coeff csts ~reward_kind:Seed_nonce_revelation_tip in @@ -255,7 +244,6 @@ let collect_expected_rewards ~ctxt = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; - liquidity_baking_subsidy; seed_nonce_revelation_tip; vdf_revelation_tip; } diff --git a/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli b/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli index 04c6c96b1072..058845f9b80a 100644 --- a/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli +++ b/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli @@ -30,7 +30,6 @@ type expected_rewards = { baking_reward_fixed_portion : Tez.t; baking_reward_bonus_per_slot : Tez.t; attesting_reward_per_slot : Tez.t; - liquidity_baking_subsidy : Tez.t; seed_nonce_revelation_tip : Tez.t; vdf_revelation_tip : Tez.t; } diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 196a13c37333..5e40d58c7443 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -895,7 +895,6 @@ module Constants : sig baking_reward_fixed_portion_weight : int; baking_reward_bonus_weight : int; attesting_reward_weight : int; - liquidity_baking_subsidy_weight : int; seed_nonce_revelation_tip_weight : int; vdf_revelation_tip_weight : int; } @@ -921,6 +920,7 @@ module Constants : sig quorum_min : int32; quorum_max : int32; min_proposal_quorum : int32; + liquidity_baking_subsidy : Tez.t; liquidity_baking_toggle_ema_threshold : int32; max_operations_time_to_live : int; minimal_block_delay : Period.t; @@ -2345,7 +2345,6 @@ module Delegate : sig | Baking_reward_fixed_portion | Baking_reward_bonus_per_slot | Attesting_reward_per_slot - | Liquidity_baking_subsidy | Seed_nonce_revelation_tip | Vdf_revelation_tip @@ -2361,6 +2360,9 @@ module Delegate : sig reward_kind:reward_kind -> Tez.t tzresult + val liquidity_baking_subsidy_from_constants : + Constants.Parametric.t -> Tez.t tzresult + (** [get_reward_coeff ctxt cycle] reads the reward coeff for the given cycle from the storage. Returns [Q.one] if the given cycle is not between [current_cycle] and diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml index 01a61e775295..db6a94845fea 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml @@ -199,7 +199,6 @@ type issuance_weights = { baking_reward_fixed_portion_weight : int; baking_reward_bonus_weight : int; attesting_reward_weight : int; - liquidity_baking_subsidy_weight : int; seed_nonce_revelation_tip_weight : int; vdf_revelation_tip_weight : int; } @@ -225,6 +224,7 @@ type t = { quorum_min : int32; quorum_max : int32; min_proposal_quorum : int32; + liquidity_baking_subsidy : Tez_repr.t; liquidity_baking_toggle_ema_threshold : int32; max_operations_time_to_live : int; minimal_block_delay : Period_repr.t; @@ -512,7 +512,6 @@ let issuance_weights_encoding = baking_reward_fixed_portion_weight; baking_reward_bonus_weight; attesting_reward_weight; - liquidity_baking_subsidy_weight; seed_nonce_revelation_tip_weight; vdf_revelation_tip_weight; } : @@ -521,14 +520,12 @@ let issuance_weights_encoding = baking_reward_fixed_portion_weight, baking_reward_bonus_weight, attesting_reward_weight, - liquidity_baking_subsidy_weight, seed_nonce_revelation_tip_weight, vdf_revelation_tip_weight )) (fun ( base_total_issued_per_minute, baking_reward_fixed_portion_weight, baking_reward_bonus_weight, attesting_reward_weight, - liquidity_baking_subsidy_weight, seed_nonce_revelation_tip_weight, vdf_revelation_tip_weight ) -> { @@ -536,16 +533,14 @@ let issuance_weights_encoding = baking_reward_fixed_portion_weight; baking_reward_bonus_weight; attesting_reward_weight; - liquidity_baking_subsidy_weight; seed_nonce_revelation_tip_weight; vdf_revelation_tip_weight; }) - (obj7 + (obj6 (req "base_total_issued_per_minute" Tez_repr.encoding) (req "baking_reward_fixed_portion_weight" int31) (req "baking_reward_bonus_weight" int31) (req "attesting_reward_weight" int31) - (req "liquidity_baking_subsidy_weight" int31) (req "seed_nonce_revelation_tip_weight" int31) (req "vdf_revelation_tip_weight" int31)) @@ -573,6 +568,7 @@ let encoding = c.quorum_min ), ( ( c.quorum_max, c.min_proposal_quorum, + c.liquidity_baking_subsidy, c.liquidity_baking_toggle_ema_threshold, c.max_operations_time_to_live, c.minimal_block_delay, @@ -614,6 +610,7 @@ let encoding = quorum_min ), ( ( quorum_max, min_proposal_quorum, + liquidity_baking_subsidy, liquidity_baking_toggle_ema_threshold, max_operations_time_to_live, minimal_block_delay, @@ -656,6 +653,7 @@ let encoding = quorum_min; quorum_max; min_proposal_quorum; + liquidity_baking_subsidy; liquidity_baking_toggle_ema_threshold; max_operations_time_to_live; minimal_block_delay; @@ -708,9 +706,10 @@ let encoding = (req "hard_storage_limit_per_operation" z) (req "quorum_min" int32)) (merge_objs - (obj8 + (obj9 (req "quorum_max" int32) (req "min_proposal_quorum" int32) + (req "liquidity_baking_subsidy" Tez_repr.encoding) (req "liquidity_baking_toggle_ema_threshold" int32) (req "max_operations_time_to_live" int16) (req "minimal_block_delay" Period_repr.encoding) diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli index da434f1c42b8..37cf9a2168f2 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli @@ -166,7 +166,6 @@ type issuance_weights = { baking_reward_fixed_portion_weight : int; baking_reward_bonus_weight : int; attesting_reward_weight : int; - liquidity_baking_subsidy_weight : int; seed_nonce_revelation_tip_weight : int; vdf_revelation_tip_weight : int; } @@ -199,6 +198,7 @@ type t = { (* in centile of a percentage *) quorum_max : int32; min_proposal_quorum : int32; + liquidity_baking_subsidy : Tez_repr.t; liquidity_baking_toggle_ema_threshold : int32; max_operations_time_to_live : int; minimal_block_delay : Period_repr.t; diff --git a/src/proto_alpha/lib_protocol/constants_repr.ml b/src/proto_alpha/lib_protocol/constants_repr.ml index 9baca9476477..c9a74ff2e3d0 100644 --- a/src/proto_alpha/lib_protocol/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_repr.ml @@ -348,18 +348,17 @@ module Generated = struct let max_slashing_threshold = (consensus_committee_size / 3) + 1 in let consensus_threshold = (consensus_committee_size * 2 / 3) + 1 in let bonus_committee_size = consensus_committee_size - consensus_threshold in - let base_total_issued_per_minute = Tez_repr.of_mutez_exn 85_007_812L in + let base_total_issued_per_minute = Tez_repr.of_mutez_exn 80_007_812L in let _reward_parts_whole = 20480 (* = 256 * 80 *) in let reward_parts_half = 10240 (* = reward_parts_whole / 2 *) in let reward_parts_quarter = 5120 (* = reward_parts_whole / 4 *) in - let reward_parts_16th = 1280 (* = reward_parts_whole / 16 *) in { max_slashing_threshold; consensus_threshold; issuance_weights = { base_total_issued_per_minute; - (* 85.007812 tez/minute *) + (* 80.007812 tez/minute *) baking_reward_fixed_portion_weight = (* 1/4 or 1/2 *) (if Compare.Int.(bonus_committee_size <= 0) then @@ -373,8 +372,6 @@ module Generated = struct attesting_reward_weight = reward_parts_half; (* 1/2 *) (* All block (baking + attesting)rewards sum to 1 ( *256*80 ) *) - liquidity_baking_subsidy_weight = reward_parts_16th; - (* 1/16 *) seed_nonce_revelation_tip_weight = 1; (* 1/20480 *) vdf_revelation_tip_weight = 1; diff --git a/src/proto_alpha/lib_protocol/delegate_rewards.ml b/src/proto_alpha/lib_protocol/delegate_rewards.ml index 0b61dae93a05..c4d3458a05db 100644 --- a/src/proto_alpha/lib_protocol/delegate_rewards.ml +++ b/src/proto_alpha/lib_protocol/delegate_rewards.ml @@ -30,7 +30,6 @@ let sum_weights baking_reward_fixed_portion_weight; baking_reward_bonus_weight; attesting_reward_weight; - liquidity_baking_subsidy_weight; seed_nonce_revelation_tip_weight; vdf_revelation_tip_weight; } : @@ -38,7 +37,6 @@ let sum_weights let r = baking_reward_fixed_portion_weight in let r = baking_reward_bonus_weight + r in let r = attesting_reward_weight + r in - let r = liquidity_baking_subsidy_weight + r in let r = seed_nonce_revelation_tip_weight + r in let r = vdf_revelation_tip_weight + r in assert (Compare.Int.(r > 0)) ; @@ -75,7 +73,6 @@ module M = struct | Baking_reward_fixed_portion | Baking_reward_bonus_per_slot | Attesting_reward_per_slot - | Liquidity_baking_subsidy | Seed_nonce_revelation_tip | Vdf_revelation_tip @@ -90,8 +87,6 @@ module M = struct | Baking_reward_bonus_per_slot -> issuance_weights.baking_reward_bonus_weight | Attesting_reward_per_slot -> issuance_weights.attesting_reward_weight - | Liquidity_baking_subsidy -> - issuance_weights.liquidity_baking_subsidy_weight | Seed_nonce_revelation_tip -> (* Seed nonce revelation rewards are given every [blocks_per_commitment](=192)th block *) let blocks_per_commitment = Int32.to_int csts.blocks_per_commitment in @@ -119,6 +114,17 @@ module M = struct | _ -> rewards in Tez_repr.mul_q ~rounding:`Down base_rewards coeff + + let liquidity_baking_subsidy_from_constants + (constants : Constants_parametric_repr.t) = + let liquidity_baking_subsidy = constants.liquidity_baking_subsidy in + let minimal_block_delay = + constants.minimal_block_delay |> Period_repr.to_seconds |> Int64.to_int + in + Tez_repr.mul_q + ~rounding:`Down + liquidity_baking_subsidy + Q.(minimal_block_delay // 60) end open M @@ -138,7 +144,8 @@ let attesting_reward_per_slot ctxt = reward_from_context ~ctxt ~reward_kind:Attesting_reward_per_slot let liquidity_baking_subsidy ctxt = - reward_from_context ~ctxt ~reward_kind:Liquidity_baking_subsidy + let constants = Raw_context.constants ctxt in + liquidity_baking_subsidy_from_constants constants let seed_nonce_revelation_tip ctxt = reward_from_context ~ctxt ~reward_kind:Seed_nonce_revelation_tip diff --git a/src/proto_alpha/lib_protocol/delegate_rewards.mli b/src/proto_alpha/lib_protocol/delegate_rewards.mli index 56dd01fab5ab..309143c31bba 100644 --- a/src/proto_alpha/lib_protocol/delegate_rewards.mli +++ b/src/proto_alpha/lib_protocol/delegate_rewards.mli @@ -42,7 +42,6 @@ module For_RPC : sig | Baking_reward_fixed_portion | Baking_reward_bonus_per_slot | Attesting_reward_per_slot - | Liquidity_baking_subsidy | Seed_nonce_revelation_tip | Vdf_revelation_tip @@ -57,4 +56,7 @@ module For_RPC : sig Constants_parametric_repr.t -> reward_kind:reward_kind -> Tez_repr.t tzresult + + val liquidity_baking_subsidy_from_constants : + Constants_parametric_repr.t -> Tez_repr.t tzresult end diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 7384edbc1f12..2b13a0253164 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1185,25 +1185,32 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = ns_enable = false; } in - let issuance_weights : Constants_parametric_repr.issuance_weights = + let liquidity_baking_subsidy = Tez_repr.(mul_exn one 5) in + let (issuance_weights : Constants_parametric_repr.issuance_weights) = let ({ base_total_issued_per_minute; baking_reward_fixed_portion_weight; baking_reward_bonus_weight; attesting_reward_weight; - liquidity_baking_subsidy_weight; + liquidity_baking_subsidy_weight = _; seed_nonce_revelation_tip_weight; vdf_revelation_tip_weight; } : Constants_parametric_previous_repr.issuance_weights) = c.issuance_weights in + let base_total_issued_per_minute = + let x = + Tez_repr.( + sub_opt base_total_issued_per_minute liquidity_baking_subsidy) + in + match x with None -> assert false | Some x -> x + in { base_total_issued_per_minute; baking_reward_fixed_portion_weight; baking_reward_bonus_weight; attesting_reward_weight; - liquidity_baking_subsidy_weight; seed_nonce_revelation_tip_weight; vdf_revelation_tip_weight; } @@ -1242,6 +1249,7 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = quorum_min = c.quorum_min; quorum_max = c.quorum_max; min_proposal_quorum = c.min_proposal_quorum; + liquidity_baking_subsidy; liquidity_baking_toggle_ema_threshold = c.liquidity_baking_toggle_ema_threshold; minimal_block_delay = c.minimal_block_delay; diff --git a/src/proto_alpha/lib_protocol/test/helpers/context.ml b/src/proto_alpha/lib_protocol/test/helpers/context.ml index 3231e3cf60b2..db2eb18093b5 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/context.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/context.ml @@ -285,9 +285,7 @@ let get_liquidity_baking_subsidy ctxt = let open Lwt_result_wrap_syntax in let* {Constants.parametric = csts; _} = get_constants ctxt in let*?@ reward = - Delegate.Rewards.For_RPC.reward_from_constants - csts - ~reward_kind:Liquidity_baking_subsidy + Delegate.Rewards.For_RPC.liquidity_baking_subsidy_from_constants csts in return reward diff --git a/src/proto_alpha/lib_protocol/test/helpers/liquidity_baking_machine.ml b/src/proto_alpha/lib_protocol/test/helpers/liquidity_baking_machine.ml index ae432ce87a12..e18fec45dd60 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/liquidity_baking_machine.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/liquidity_baking_machine.ml @@ -378,13 +378,8 @@ end (** {2 Tezos Constants} *) let default_subsidy = - let open Tezos_protocol_alpha_parameters in let c = Default_parameters.constants_test in - match - Delegate.Rewards.For_RPC.reward_from_constants - c - ~reward_kind:Liquidity_baking_subsidy - with + match Delegate.Rewards.For_RPC.liquidity_baking_subsidy_from_constants c with | Ok x -> Tez.to_mutez x | Error _ -> assert false @@ -879,16 +874,7 @@ module ConcreteBaseMachine : let* op2 = reveal tzbtc_admin_account state in bake ~invariant ~baker:env.holder [op2] env state - let init ~invariant ?subsidy accounts_balances = - let liquidity_baking_subsidy = - Option.value ~default:default_subsidy subsidy |> Tez.of_mutez_exn - in - let block_delay = - Period.to_seconds - Tezos_protocol_alpha_parameters.Default_parameters.constants_test - .minimal_block_delay - |> Int64.to_int - in + let init ~invariant ?subsidy:_ accounts_balances = let n, bootstrap_balances = initial_xtz_repartition accounts_balances in let* result = Context.init_n @@ -896,18 +882,6 @@ module ConcreteBaseMachine : ~consensus_threshold:0 ~bootstrap_balances ~cost_per_byte:Tez.zero - ~issuance_weights: - { - base_total_issued_per_minute = - Test_tez.( - liquidity_baking_subsidy *! 60L /! Int64.of_int block_delay); - attesting_reward_weight = 0; - baking_reward_fixed_portion_weight = 0; - baking_reward_bonus_weight = 0; - seed_nonce_revelation_tip_weight = 0; - vdf_revelation_tip_weight = 0; - liquidity_baking_subsidy_weight = 1; - } ~origination_size:0 ~blocks_per_cycle:10_000l ~cycles_per_voting_period:1l diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/test_seed.ml b/src/proto_alpha/lib_protocol/test/integration/consensus/test_seed.ml index 112454d07b3c..384bd40f0dc4 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/test_seed.ml +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/test_seed.ml @@ -313,7 +313,6 @@ let test_unrevealed () = baking_reward_fixed_portion_weight = 0; seed_nonce_revelation_tip_weight = 0; vdf_revelation_tip_weight = 0; - liquidity_baking_subsidy_weight = 0; }; consensus_threshold = 0; minimal_participation_ratio = Ratio.{numerator = 0; denominator = 1}; diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_voting.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_voting.ml index 21eb46c06729..d7fc680cea08 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/test_voting.ml +++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_voting.ml @@ -279,7 +279,6 @@ let context_init_tup tup ?(blocks_per_cycle = 4l) = baking_reward_fixed_portion_weight = 1; seed_nonce_revelation_tip_weight = 1; vdf_revelation_tip_weight = 1; - liquidity_baking_subsidy_weight = 1; } ~nonce_revelation_threshold:2l diff --git a/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_roundtrip.ml b/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_roundtrip.ml index 87e6b48a335a..3390af28a1d4 100644 --- a/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_roundtrip.ml +++ b/src/proto_alpha/lib_protocol/test/integration/test_adaptive_issuance_roundtrip.ml @@ -1900,11 +1900,11 @@ let init_constants ?reward_per_block ?(deactivate_dynamic = false) baking_reward_fixed_portion_weight = 1; baking_reward_bonus_weight = 0; attesting_reward_weight = 0; - liquidity_baking_subsidy_weight = 0; seed_nonce_revelation_tip_weight = 0; vdf_revelation_tip_weight = 0; } in + let liquidity_baking_subsidy = Tez.zero in let minimal_block_delay = Protocol.Alpha_context.Period.one_minute in let cost_per_byte = Tez.zero in let consensus_threshold = 0 in @@ -1930,6 +1930,7 @@ let init_constants ?reward_per_block ?(deactivate_dynamic = false) cost_per_byte; adaptive_issuance; blocks_per_cycle; + liquidity_baking_subsidy; } (** Initialization of scenarios with 3 cases: diff --git a/src/proto_alpha/lib_protocol/test/integration/test_constants.ml b/src/proto_alpha/lib_protocol/test/integration/test_constants.ml index 2b7c9d3cd58d..6f975bada710 100644 --- a/src/proto_alpha/lib_protocol/test/integration/test_constants.ml +++ b/src/proto_alpha/lib_protocol/test/integration/test_constants.ml @@ -235,7 +235,9 @@ let liquidity_baking_subsidy_param () = let*? total_rewards = baking_rewards +? validators_rewards in let expected_subsidy = total_rewards /! 16L in let*?@ liquidity_baking_subsidy = - get_reward ~reward_kind:Liquidity_baking_subsidy + Protocol.Alpha_context.Delegate.Rewards.For_RPC + .liquidity_baking_subsidy_from_constants + constants in let*? diff = liquidity_baking_subsidy -? expected_subsidy in let max_diff = 1000 (* mutez *) in -- GitLab From f9849390cfb7fe99a8e2e8cf0b4cdad8f93db9f6 Mon Sep 17 00:00:00 2001 From: Marina Polubelova Date: Fri, 16 Feb 2024 09:58:18 +0100 Subject: [PATCH 2/4] tezt/tests: reset regressions --- tezt/tests/adaptive_issuance.ml | 16 +++++++-------- ...PC regression tests- adaptive_issuance.out | 20 +++++++++---------- ...t) RPC regression tests- misc_protocol.out | 4 ++-- ...PC regression tests- adaptive_issuance.out | 20 +++++++++---------- ...t) RPC regression tests- misc_protocol.out | 4 ++-- ...PC regression tests- adaptive_issuance.out | 20 +++++++++---------- ...y) RPC regression tests- misc_protocol.out | 4 ++-- ...PC regression tests- adaptive_issuance.out | 20 +++++++++---------- ...r) RPC regression tests- misc_protocol.out | 4 ++-- ...PC regression tests- adaptive_issuance.out | 20 +++++++++---------- ...c) RPC regression tests- misc_protocol.out | 4 ++-- 11 files changed, 68 insertions(+), 68 deletions(-) diff --git a/tezt/tests/adaptive_issuance.ml b/tezt/tests/adaptive_issuance.ml index 761458d0be73..789e1d030339 100644 --- a/tezt/tests/adaptive_issuance.ml +++ b/tezt/tests/adaptive_issuance.ml @@ -810,10 +810,10 @@ let test_staking = let* bu = Operation_receipt.get_block_metadata client_1 in let* bu = Operation_receipt.Balance_updates.from_result [bu] in - let amount_baker_share = 786 in - let amount_delegation = 7413 in + let amount_baker_share = 834 in + let amount_delegation = 7877 in let amount_edge = 4 in - let amount_stakers = 3 in + let amount_stakers = 4 in (* check rewards *) check_balance_updates bu @@ -1009,8 +1009,8 @@ let test_staking = (* check slashed and rewarded amounts *) (* total amounts *) - let total_amount_rewarded = 1450001818 in - let total_amount_slashed = 8700010914 in + let total_amount_rewarded = 1450001824 in + let total_amount_slashed = 8700010946 in (* slashed stakers (including baker) unstake deposit *) let amount_rewarded_from_unstake_stakers_deposits = 7142857 in @@ -1018,11 +1018,11 @@ let test_staking = (* slashed stake *) let amount_rewarded_from_stakers_deposits = 7178393 in - let amount_slashed_from_stakers_deposits = 43070361 in + let amount_slashed_from_stakers_deposits = 43070362 in (* slashing baker (bootstrap2) stake*) - let amount_rewarded_from_baker_deposits = 1435680568 in - let amount_slashed_from_baker_deposits = 8614083410 in + let amount_rewarded_from_baker_deposits = 1435680574 in + let amount_slashed_from_baker_deposits = 8614083440 in assert ( check_with_roundings diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out index 3cad01b30712..0114e0aaadd5 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out @@ -23,13 +23,13 @@ "1000000000000" ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate -"223.400" +"210.260" ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_exact -{ "numerator": "44680105987200", "denominator": "200000010001" } +{ "numerator": "42052105987200", "denominator": "200000010001" } ./octez-client rpc get /chains/main/blocks/head/context/issuance/issuance_per_minute -"85007812" +"80007812" ./octez-client rpc get /chains/main/blocks/head/context/adaptive_issuance_launch_cycle null @@ -37,23 +37,23 @@ null ./octez-client rpc get /chains/main/blocks/head/context/issuance/expected_issuance [ { "cycle": 0, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 1, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 2, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" } ] + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" } ] ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", "frozen_deposits": "200000000000" } ] ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_details -{ "static": { "numerator": "44680105987200", "denominator": "200000010001" }, +{ "static": { "numerator": "42052105987200", "denominator": "200000010001" }, "dynamic": { "numerator": "0", "denominator": "1" } } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/total_delegated_stake' 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 06b2c855d8e5..f945c9ee8064 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 @@ -18,13 +18,13 @@ "minimal_stake": "6000000000", "minimal_frozen_stake": "600000000", "vdf_difficulty": "50000", "origination_size": 257, "issuance_weights": - { "base_total_issued_per_minute": "85007812", + { "base_total_issued_per_minute": "80007812", "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, - "liquidity_baking_subsidy_weight": 1280, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, + "liquidity_baking_subsidy": "5000000", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 8, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out index 14be7f3f931d..4cd8cf5d1084 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out @@ -23,13 +23,13 @@ "1000000000000" ./octez-client --mode light rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate -"223.400" +"210.260" ./octez-client --mode light rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_exact -{ "numerator": "44680105987200", "denominator": "200000010001" } +{ "numerator": "42052105987200", "denominator": "200000010001" } ./octez-client --mode light rpc get /chains/main/blocks/head/context/issuance/issuance_per_minute -"85007812" +"80007812" ./octez-client --mode light rpc get /chains/main/blocks/head/context/adaptive_issuance_launch_cycle null @@ -37,23 +37,23 @@ null ./octez-client --mode light rpc get /chains/main/blocks/head/context/issuance/expected_issuance [ { "cycle": 0, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 1, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 2, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" } ] + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" } ] ./octez-client --mode light rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", "frozen_deposits": "200000000000" } ] ./octez-client --mode light rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_details -{ "static": { "numerator": "44680105987200", "denominator": "200000010001" }, +{ "static": { "numerator": "42052105987200", "denominator": "200000010001" }, "dynamic": { "numerator": "0", "denominator": "1" } } ./octez-client --mode light rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/total_delegated_stake' 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 2769d416945a..607044fe19a6 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 @@ -18,13 +18,13 @@ "minimal_stake": "6000000000", "minimal_frozen_stake": "600000000", "vdf_difficulty": "50000", "origination_size": 257, "issuance_weights": - { "base_total_issued_per_minute": "85007812", + { "base_total_issued_per_minute": "80007812", "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, - "liquidity_baking_subsidy_weight": 1280, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, + "liquidity_baking_subsidy": "5000000", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 8, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out index 831e33f37106..964ebe474633 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out @@ -23,13 +23,13 @@ "1000000000000" ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate -"223.400" +"210.260" ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_exact -{ "numerator": "44680105987200", "denominator": "200000010001" } +{ "numerator": "42052105987200", "denominator": "200000010001" } ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/issuance/issuance_per_minute -"85007812" +"80007812" ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/adaptive_issuance_launch_cycle null @@ -37,23 +37,23 @@ null ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/issuance/expected_issuance [ { "cycle": 0, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 1, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 2, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" } ] + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" } ] ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", "frozen_deposits": "200000000000" } ] ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_details -{ "static": { "numerator": "44680105987200", "denominator": "200000010001" }, +{ "static": { "numerator": "42052105987200", "denominator": "200000010001" }, "dynamic": { "numerator": "0", "denominator": "1" } } ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/total_delegated_stake' 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 bb6c99fd26f4..2e54b8ee0dca 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 @@ -18,13 +18,13 @@ "minimal_stake": "6000000000", "minimal_frozen_stake": "600000000", "vdf_difficulty": "50000", "origination_size": 257, "issuance_weights": - { "base_total_issued_per_minute": "85007812", + { "base_total_issued_per_minute": "80007812", "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, - "liquidity_baking_subsidy_weight": 1280, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, + "liquidity_baking_subsidy": "5000000", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 8, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- adaptive_issuance.out index 83795c14bfdc..4f69a65ab9fd 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- adaptive_issuance.out @@ -23,13 +23,13 @@ "1000000000000" ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate -"223.400" +"210.260" ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_exact -{ "numerator": "744668433120000", "denominator": "3333333569461" } +{ "numerator": "700868433120000", "denominator": "3333333569461" } ./octez-client rpc get /chains/main/blocks/head/context/issuance/issuance_per_minute -"85007812" +"80007812" ./octez-client rpc get /chains/main/blocks/head/context/adaptive_issuance_launch_cycle null @@ -37,16 +37,16 @@ null ./octez-client rpc get /chains/main/blocks/head/context/issuance/expected_issuance [ { "cycle": 0, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 1, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 2, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" } ] + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" } ] ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", @@ -54,7 +54,7 @@ null ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_details { "static": - { "numerator": "744668433120000", "denominator": "3333333569461" }, + { "numerator": "700868433120000", "denominator": "3333333569461" }, "dynamic": { "numerator": "0", "denominator": "1" } } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/total_delegated_stake' 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 30c135145e2b..4475dea214b6 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 @@ -18,13 +18,13 @@ "minimal_stake": "6000000000", "minimal_frozen_stake": "600000000", "vdf_difficulty": "50000", "origination_size": 257, "issuance_weights": - { "base_total_issued_per_minute": "85007812", + { "base_total_issued_per_minute": "80007812", "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, - "liquidity_baking_subsidy_weight": 1280, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, + "liquidity_baking_subsidy": "5000000", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 8, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- adaptive_issuance.out index 83795c14bfdc..4f69a65ab9fd 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- adaptive_issuance.out @@ -23,13 +23,13 @@ "1000000000000" ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate -"223.400" +"210.260" ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_exact -{ "numerator": "744668433120000", "denominator": "3333333569461" } +{ "numerator": "700868433120000", "denominator": "3333333569461" } ./octez-client rpc get /chains/main/blocks/head/context/issuance/issuance_per_minute -"85007812" +"80007812" ./octez-client rpc get /chains/main/blocks/head/context/adaptive_issuance_launch_cycle null @@ -37,16 +37,16 @@ null ./octez-client rpc get /chains/main/blocks/head/context/issuance/expected_issuance [ { "cycle": 0, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 1, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" }, + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" }, { "cycle": 2, "baking_reward_fixed_portion": "333333", "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "liquidity_baking_subsidy": "83333", - "seed_nonce_revelation_tip": "260", "vdf_revelation_tip": "260" } ] + "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", + "vdf_revelation_tip": "260" } ] ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", @@ -54,7 +54,7 @@ null ./octez-client rpc get /chains/main/blocks/head/context/issuance/current_yearly_rate_details { "static": - { "numerator": "744668433120000", "denominator": "3333333569461" }, + { "numerator": "700868433120000", "denominator": "3333333569461" }, "dynamic": { "numerator": "0", "denominator": "1" } } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/total_delegated_stake' 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 30c135145e2b..4475dea214b6 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 @@ -18,13 +18,13 @@ "minimal_stake": "6000000000", "minimal_frozen_stake": "600000000", "vdf_difficulty": "50000", "origination_size": 257, "issuance_weights": - { "base_total_issued_per_minute": "85007812", + { "base_total_issued_per_minute": "80007812", "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, - "liquidity_baking_subsidy_weight": 1280, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, + "liquidity_baking_subsidy": "5000000", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 8, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, -- GitLab From 734ef7eadb63575b0bcad473e2b9279b59f37ff8 Mon Sep 17 00:00:00 2001 From: Marina Polubelova Date: Fri, 16 Feb 2024 09:59:08 +0100 Subject: [PATCH 3/4] kaitai: reset regressions --- contrib/kaitai-struct-files/files/alpha__constants.ksy | 4 ++-- .../files/alpha__constants__parametric.ksy | 4 ++-- contrib/kaitai-struct-files/files/alpha__parameters.ksy | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/kaitai-struct-files/files/alpha__constants.ksy b/contrib/kaitai-struct-files/files/alpha__constants.ksy index 19fa2c0fd159..ece586cd5d2d 100644 --- a/contrib/kaitai-struct-files/files/alpha__constants.ksy +++ b/contrib/kaitai-struct-files/files/alpha__constants.ksy @@ -104,8 +104,6 @@ types: type: int31 - id: attesting_reward_weight type: int31 - - id: liquidity_baking_subsidy_weight - type: int31 - id: seed_nonce_revelation_tip_weight type: int31 - id: vdf_revelation_tip_weight @@ -254,6 +252,8 @@ seq: type: s4 - id: min_proposal_quorum type: s4 +- id: liquidity_baking_subsidy + type: alpha__mutez - id: liquidity_baking_toggle_ema_threshold type: s4 - id: max_operations_time_to_live diff --git a/contrib/kaitai-struct-files/files/alpha__constants__parametric.ksy b/contrib/kaitai-struct-files/files/alpha__constants__parametric.ksy index 5bd0ece08871..a0d7d34d76c6 100644 --- a/contrib/kaitai-struct-files/files/alpha__constants__parametric.ksy +++ b/contrib/kaitai-struct-files/files/alpha__constants__parametric.ksy @@ -104,8 +104,6 @@ types: type: int31 - id: attesting_reward_weight type: int31 - - id: liquidity_baking_subsidy_weight - type: int31 - id: seed_nonce_revelation_tip_weight type: int31 - id: vdf_revelation_tip_weight @@ -226,6 +224,8 @@ seq: type: s4 - id: min_proposal_quorum type: s4 +- id: liquidity_baking_subsidy + type: alpha__mutez - id: liquidity_baking_toggle_ema_threshold type: s4 - id: max_operations_time_to_live diff --git a/contrib/kaitai-struct-files/files/alpha__parameters.ksy b/contrib/kaitai-struct-files/files/alpha__parameters.ksy index 7adea7423c07..922565bbfd25 100644 --- a/contrib/kaitai-struct-files/files/alpha__parameters.ksy +++ b/contrib/kaitai-struct-files/files/alpha__parameters.ksy @@ -238,8 +238,6 @@ types: type: int31 - id: attesting_reward_weight type: int31 - - id: liquidity_baking_subsidy_weight - type: int31 - id: seed_nonce_revelation_tip_weight type: int31 - id: vdf_revelation_tip_weight @@ -504,6 +502,8 @@ seq: type: s4 - id: min_proposal_quorum type: s4 +- id: liquidity_baking_subsidy + type: alpha__mutez - id: liquidity_baking_toggle_ema_threshold type: s4 - id: max_operations_time_to_live -- GitLab From 53d86f69869c43acd26877bb06222b45eef5d038 Mon Sep 17 00:00:00 2001 From: Marina Polubelova Date: Fri, 16 Feb 2024 14:15:23 +0100 Subject: [PATCH 4/4] docs/proto: update alpha changelog --- docs/protocols/alpha.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index 23f3ac2ae51a..1327428db3ca 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -116,6 +116,10 @@ Breaking Changes RPC Changes ----------- +- Make ``liquidity_baking_subsidy`` a protocol constant independent of Adaptive Issuance (MR :gl:`!11971`). + This changes the JSON from the RPC ``/chains/main/blocks/head/context/constants`` + and ``/chains/main/blocks/head/context/issuance/expected_issuance``. + Operation receipts ------------------ @@ -129,6 +133,8 @@ Protocol parameters - Set the number of blocks preservation cycles to 1. (MR :gl:`!11325`) +- Set ``liquidity_baking_subsidy`` to 5 tez issued per minute (MR :gl:`!11971`) + Bug Fixes --------- -- GitLab