From d00b7d0905c33b2891df16185ea49033f77becf4 Mon Sep 17 00:00:00 2001 From: Sophia Gold Date: Fri, 26 Aug 2022 12:19:22 -0400 Subject: [PATCH 1/4] Proto_liquidity_baking: remove sunset --- src/proto_alpha/lib_parameters/default_parameters.ml | 5 ----- src/proto_alpha/lib_protocol/alpha_context.mli | 3 --- src/proto_alpha/lib_protocol/constants_parametric_repr.ml | 7 +------ src/proto_alpha/lib_protocol/constants_parametric_repr.mli | 1 - src/proto_alpha/lib_protocol/constants_storage.ml | 4 ---- src/proto_alpha/lib_protocol/constants_storage.mli | 2 -- src/proto_alpha/lib_protocol/liquidity_baking_storage.ml | 7 +------ src/proto_alpha/lib_protocol/liquidity_baking_storage.mli | 1 - src/proto_alpha/lib_protocol/raw_context.ml | 1 - 9 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 1e333ec15d8e..dd0b6e869c4d 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -118,9 +118,6 @@ let constants_mainnet = min_proposal_quorum = 5_00l; (* liquidity_baking_subsidy is 1/16th of maximum total rewards for a block *) liquidity_baking_subsidy (* 2_500_000 mutez *); - (* level after protocol activation when liquidity baking shuts off: - about 6 months after first activation on mainnet *) - liquidity_baking_sunset_level = 3_063_809l; (* 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; @@ -281,7 +278,6 @@ let constants_sandbox = cycles_per_voting_period = 8l; proof_of_work_threshold = Int64.of_int (-1); vdf_difficulty = 50_000L; - liquidity_baking_sunset_level = 128l; liquidity_baking_subsidy; minimal_block_delay = Period.of_seconds_exn (Int64.of_int block_time); delay_increment_per_round = Period.one_second; @@ -318,7 +314,6 @@ let constants_test = cycles_per_voting_period = 2l; proof_of_work_threshold = Int64.of_int (-1); vdf_difficulty = 50_000L; - liquidity_baking_sunset_level = 4096l; liquidity_baking_subsidy; consensus_committee_size; consensus_threshold (* 17 slots *); diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index e298a64b0f08..6a073710a4ce 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -845,7 +845,6 @@ module Constants : sig quorum_max : int32; min_proposal_quorum : int32; liquidity_baking_subsidy : Tez.t; - liquidity_baking_sunset_level : int32; liquidity_baking_toggle_ema_threshold : int32; max_operations_time_to_live : int; minimal_block_delay : Period.t; @@ -934,8 +933,6 @@ module Constants : sig val liquidity_baking_subsidy : context -> Tez.t - val liquidity_baking_sunset_level : context -> int32 - val liquidity_baking_toggle_ema_threshold : context -> int32 val minimal_block_delay : context -> Period.t diff --git a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml index b443b19048e7..59d1c6c1db16 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.ml @@ -152,7 +152,6 @@ type t = { quorum_max : int32; min_proposal_quorum : int32; liquidity_baking_subsidy : Tez_repr.t; - liquidity_baking_sunset_level : int32; liquidity_baking_toggle_ema_threshold : int32; max_operations_time_to_live : int; minimal_block_delay : Period_repr.t; @@ -348,7 +347,6 @@ let encoding = ( ( c.quorum_max, c.min_proposal_quorum, c.liquidity_baking_subsidy, - c.liquidity_baking_sunset_level, c.liquidity_baking_toggle_ema_threshold, c.max_operations_time_to_live, c.minimal_block_delay, @@ -388,7 +386,6 @@ let encoding = ( ( quorum_max, min_proposal_quorum, liquidity_baking_subsidy, - liquidity_baking_sunset_level, liquidity_baking_toggle_ema_threshold, max_operations_time_to_live, minimal_block_delay, @@ -429,7 +426,6 @@ let encoding = quorum_max; min_proposal_quorum; liquidity_baking_subsidy; - liquidity_baking_sunset_level; liquidity_baking_toggle_ema_threshold; max_operations_time_to_live; minimal_block_delay; @@ -479,11 +475,10 @@ let encoding = (req "hard_storage_limit_per_operation" z) (req "quorum_min" int32)) (merge_objs - (obj10 + (obj9 (req "quorum_max" int32) (req "min_proposal_quorum" int32) (req "liquidity_baking_subsidy" Tez_repr.encoding) - (req "liquidity_baking_sunset_level" int32) (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 132226d6b584..ded965c7a765 100644 --- a/src/proto_alpha/lib_protocol/constants_parametric_repr.mli +++ b/src/proto_alpha/lib_protocol/constants_parametric_repr.mli @@ -161,7 +161,6 @@ type t = { quorum_max : int32; min_proposal_quorum : int32; liquidity_baking_subsidy : Tez_repr.t; - liquidity_baking_sunset_level : int32; 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_storage.ml b/src/proto_alpha/lib_protocol/constants_storage.ml index 45b2c3dfa0ce..3c9a5783ca06 100644 --- a/src/proto_alpha/lib_protocol/constants_storage.ml +++ b/src/proto_alpha/lib_protocol/constants_storage.ml @@ -112,10 +112,6 @@ let liquidity_baking_subsidy c = let constants = Raw_context.constants c in constants.liquidity_baking_subsidy -let liquidity_baking_sunset_level c = - let constants = Raw_context.constants c in - constants.liquidity_baking_sunset_level - let liquidity_baking_toggle_ema_threshold c = let constants = Raw_context.constants c in constants.liquidity_baking_toggle_ema_threshold diff --git a/src/proto_alpha/lib_protocol/constants_storage.mli b/src/proto_alpha/lib_protocol/constants_storage.mli index c454dcb39767..6e1ddc8819c6 100644 --- a/src/proto_alpha/lib_protocol/constants_storage.mli +++ b/src/proto_alpha/lib_protocol/constants_storage.mli @@ -74,8 +74,6 @@ val min_proposal_quorum : Raw_context.t -> int32 val liquidity_baking_subsidy : Raw_context.t -> Tez_repr.t -val liquidity_baking_sunset_level : Raw_context.t -> int32 - val liquidity_baking_toggle_ema_threshold : Raw_context.t -> int32 val parametric : Raw_context.t -> Constants_parametric_repr.t diff --git a/src/proto_alpha/lib_protocol/liquidity_baking_storage.ml b/src/proto_alpha/lib_protocol/liquidity_baking_storage.ml index 0202241484b9..56c6f3746ad7 100644 --- a/src/proto_alpha/lib_protocol/liquidity_baking_storage.ml +++ b/src/proto_alpha/lib_protocol/liquidity_baking_storage.ml @@ -41,11 +41,6 @@ let on_cpmm_exists ctxt f = return (ctxt, []) | true -> f ctxt cpmm_contract -let check_below_sunset ctxt = - let sunset_level = Constants_storage.liquidity_baking_sunset_level ctxt in - let level = Raw_level_repr.to_int32 (Level_storage.current ctxt).level in - Compare.Int32.(level < sunset_level) - let update_toggle_ema ctxt ~toggle_vote = get_toggle_ema ctxt >>=? fun old_ema -> let new_ema = compute_new_ema ~toggle_vote old_ema in @@ -58,7 +53,7 @@ let check_ema_below_threshold ctxt ema = let on_subsidy_allowed ctxt ~toggle_vote f = update_toggle_ema ctxt ~toggle_vote >>=? fun (ctxt, toggle_ema) -> - if check_ema_below_threshold ctxt toggle_ema && check_below_sunset ctxt then + if check_ema_below_threshold ctxt toggle_ema then on_cpmm_exists ctxt f >|=? fun (ctxt, operation_results) -> (ctxt, operation_results, toggle_ema) else return (ctxt, [], toggle_ema) diff --git a/src/proto_alpha/lib_protocol/liquidity_baking_storage.mli b/src/proto_alpha/lib_protocol/liquidity_baking_storage.mli index 4db50c0a2536..f1d0d5886292 100644 --- a/src/proto_alpha/lib_protocol/liquidity_baking_storage.mli +++ b/src/proto_alpha/lib_protocol/liquidity_baking_storage.mli @@ -32,7 +32,6 @@ val get_cpmm_address : Raw_context.t -> Contract_hash.t tzresult Lwt.t [toggle_vote]. Then the callback function [f] is called if the following conditions are met: - the updated EMA is below the threshold, - - the current level is below the sunset level, - the CPMM contract exists. The role of the callback function [f] is to send the subsidy to the CPMM, diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index e7d4f737d20d..6ca0e5e0fbf7 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1045,7 +1045,6 @@ let prepare_first_block ~level ~timestamp ctxt = quorum_max = c.quorum_max; min_proposal_quorum = c.min_proposal_quorum; liquidity_baking_subsidy = c.liquidity_baking_subsidy; - liquidity_baking_sunset_level = c.liquidity_baking_sunset_level; liquidity_baking_toggle_ema_threshold = c.liquidity_baking_toggle_ema_threshold; minimal_block_delay = c.minimal_block_delay; -- GitLab From 1537fde3774b481b28fa4aac139fb8c33672b3aa Mon Sep 17 00:00:00 2001 From: Sophia Gold Date: Thu, 25 Aug 2022 15:39:24 -0400 Subject: [PATCH 2/4] Proto/liquidity baking: remove sunset tests --- .../test/integration/test_liquidity_baking.ml | 88 +++++-------------- 1 file changed, 20 insertions(+), 68 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/integration/test_liquidity_baking.ml b/src/proto_alpha/lib_protocol/test/integration/test_liquidity_baking.ml index 78c42d5fce1b..21cb8aa8d4e3 100644 --- a/src/proto_alpha/lib_protocol/test/integration/test_liquidity_baking.ml +++ b/src/proto_alpha/lib_protocol/test/integration/test_liquidity_baking.ml @@ -30,7 +30,7 @@ src/proto_alpha/lib_protocol/test/integration/main.exe \ -- test "^liquidity baking$" Subject: Test liquidity baking subsidies, CPMM storage updates, - sunset shut off, and toggle vote. + and toggle vote. *) open Liquidity_baking_machine @@ -124,29 +124,6 @@ let liquidity_baking_subsidies n () = expected_credit >>=? fun () -> return_unit -(* Test that [n] blocks after the liquidity baking sunset, the subsidy is not applied anymore. - More precisely, after the sunset, the total amount credited to the subsidy is only proportional - to the sunset level and in particular it does not depend on [n]. *) -let liquidity_baking_sunset_level n () = - Context.init1 ~consensus_threshold:0 () >>=? fun (blk, _contract) -> - Context.get_liquidity_baking_cpmm_address (B blk) >>=? fun liquidity_baking -> - let liquidity_baking = Alpha_context.Contract.Originated liquidity_baking in - Context.get_constants (B blk) >>=? fun csts -> - let sunset = csts.parametric.liquidity_baking_sunset_level in - Context.Contract.balance (B blk) liquidity_baking >>=? fun old_balance -> - Block.bake_n (Int32.to_int sunset + n) blk >>=? fun blk -> - Context.get_liquidity_baking_subsidy (B blk) - >>=? fun liquidity_baking_subsidy -> - (liquidity_baking_subsidy *? Int64.(sub (of_int32 sunset) 1L)) - >>?= fun expected_credit -> - Assert.balance_was_credited - ~loc:__LOC__ - (B blk) - liquidity_baking - old_balance - expected_credit - >>=? fun () -> return_unit - (* Test that subsidy shuts off at correct level alternating baking blocks with liquidity_baking_toggle_vote set to [LB_on], [LB_off], and [LB_pass] followed by [bake_after_toggle] blocks with it set to [LB_pass]. *) (* Expected level is roughly 2*(log(1-1/(2*p)) / log(0.999)) where [p] is the proportion [LB_off / (LB_on + LB_off)]. *) @@ -197,32 +174,33 @@ let liquidity_baking_toggle_60 n () = liquidity_baking_toggle ~n_vote_on:2 ~n_vote_off:3 ~n_vote_pass:0 3583 n () (* 50% of blocks have liquidity_baking_toggle_vote = LB_off. - Subsidy should not be stopped. *) -let liquidity_baking_toggle_50 n () = + Subsidy should not be stopped. + Bakes until 100 blocks after the test sunset level of 4096 used in previous protocols. *) +let liquidity_baking_toggle_50 () = Context.init1 ~consensus_threshold:0 () >>=? fun (blk, _contract) -> Context.get_liquidity_baking_cpmm_address (B blk) >>=? fun liquidity_baking -> let liquidity_baking = Alpha_context.Contract.Originated liquidity_baking in - Context.get_constants (B blk) >>=? fun csts -> - let sunset = csts.parametric.liquidity_baking_sunset_level in Context.Contract.balance (B blk) liquidity_baking >>=? fun old_balance -> - let rec bake_50_percent_escaping blk i = - if i < Int32.to_int sunset + n then + Context.get_liquidity_baking_subsidy (B blk) + >>=? fun liquidity_baking_subsidy -> + let rec bake_stopping blk i = + if i < 4196 then Block.bake ~liquidity_baking_toggle_vote:LB_on blk >>=? fun blk -> Block.bake ~liquidity_baking_toggle_vote:LB_off blk >>=? fun blk -> - bake_50_percent_escaping blk (i + 2) + bake_stopping blk (i + 2) else return blk in - bake_50_percent_escaping blk 0 >>=? fun blk -> - Context.get_liquidity_baking_subsidy (B blk) - >>=? fun liquidity_baking_subsidy -> - (liquidity_baking_subsidy *? Int64.(sub (of_int32 sunset) 1L)) - >>?= fun expected_balance -> + bake_stopping blk 0 >>=? fun blk -> + Context.Contract.balance (B blk) liquidity_baking >>=? fun balance -> + Assert.balance_is ~loc:__LOC__ (B blk) liquidity_baking balance >>=? fun () -> + liquidity_baking_subsidy *? Int64.of_int 4196 + >>?= fun expected_final_balance -> Assert.balance_was_credited ~loc:__LOC__ (B blk) liquidity_baking old_balance - expected_balance + expected_final_balance >>=? fun () -> return_unit (* Test that the subsidy can restart if LB_on votes regain majority. @@ -317,9 +295,8 @@ let liquidity_baking_balance_update () = Context.init1 ~consensus_threshold:0 () >>=? fun (blk, _contract) -> Context.get_liquidity_baking_cpmm_address (B blk) >>=? fun liquidity_baking -> Context.get_constants (B blk) >>=? fun csts -> - let sunset = csts.parametric.liquidity_baking_sunset_level in let subsidy = csts.parametric.liquidity_baking_subsidy in - Block.bake_n_with_all_balance_updates Int32.(to_int (add sunset 100l)) blk + Block.bake_n_with_all_balance_updates 128 blk >>=? fun (_blk, balance_updates) -> let liquidity_baking_updates = List.filter @@ -343,7 +320,7 @@ let liquidity_baking_balance_update () = Assert.equal_int ~loc:__LOC__ (Int64.to_int (to_mutez credits)) - ((Int32.to_int sunset - 1) * Int64.to_int (to_mutez subsidy)) + (128 * Int64.to_int (to_mutez subsidy)) >>=? fun () -> return_unit let get_cpmm_result results = @@ -465,21 +442,6 @@ let tests = "test liquidity baking subsidy is correct" `Quick (liquidity_baking_subsidies 64); - Tztest.tztest - "test liquidity baking shuts off at sunset level when baking one block \ - longer" - `Quick - (liquidity_baking_sunset_level 1); - Tztest.tztest - "test liquidity baking shuts off at sunset level when baking two blocks \ - longer" - `Quick - (liquidity_baking_sunset_level 2); - Tztest.tztest - "test liquidity baking shuts off at sunset level when baking 100 blocks \ - longer" - `Quick - (liquidity_baking_sunset_level 100); Tztest.tztest "test liquidity baking toggle vote with 100% of bakers voting LB_off \ baking one block longer" @@ -526,20 +488,10 @@ let tests = `Quick (liquidity_baking_toggle_60 100); Tztest.tztest - "test liquidity baking shuts off at sunset level with toggle vote at 50% \ - and baking one block longer" - `Quick - (liquidity_baking_toggle_50 1); - Tztest.tztest - "test liquidity baking shuts off at sunset level with toggle vote at 50% \ - and baking two blocks longer" - `Quick - (liquidity_baking_toggle_50 2); - Tztest.tztest - "test liquidity baking shuts off at sunset level with toggle vote at 50% \ - and baking 100 blocks longer" + "test liquidity baking does not shut off with toggle vote at 50% and \ + baking 100 blocks longer than sunset level in previous protocols" `Quick - (liquidity_baking_toggle_50 100); + liquidity_baking_toggle_50; Tztest.tztest "test a liquidity baking restart with 100% of bakers voting off, then \ pass, then on" -- GitLab From 52b2bdbe93c152faf4d35f171838642e432101cf Mon Sep 17 00:00:00 2001 From: Sophia Gold Date: Thu, 25 Aug 2022 15:40:01 -0400 Subject: [PATCH 3/4] Proto/liquidity baking: remove sunset from docs and update changelog --- docs/alpha/liquidity_baking.rst | 19 +++++++------------ docs/protocols/alpha.rst | 5 +++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/alpha/liquidity_baking.rst b/docs/alpha/liquidity_baking.rst index 12c122b4ee6d..16784faf7a77 100644 --- a/docs/alpha/liquidity_baking.rst +++ b/docs/alpha/liquidity_baking.rst @@ -30,23 +30,18 @@ At every block in the chain, a small amount of tez is minted and credited to the So the credits to the CPMM contract can be accounted for by indexers, they are included in block metadata as a balance update with a new constructor for ``update_origin``, ``Subsidy``. -As a safety precaution, the subsidy expires automatically at a given -level called the liquidity baking sunset level. The sunset level can -be renewed periodically by protocol amendment. - .. _toggle_alpha: Toggle vote ~~~~~~~~~~~ -In addition to the sunset mechanism, the subsidy can be paused by a -mechanism called the Liquidity Baking Toggle Vote. At every block, the -baker producing the block includes a flag that requests ending the -subsidy or on the contrary continuing or restarting it. The context -maintains an exponential moving average of that flag. The baker has -three options for this flag: ``Off`` to request ending the subsidy, -``On`` to request continuing or restarting the subsidy, and ``Pass`` -to abstain. +The subsidy can be paused by a mechanism called the Liquidity Baking +Toggle Vote. At every block, the baker producing the block includes +a flag that requests ending the subsidy or on the contrary continuing +or restarting it. The context maintains an exponential moving average +of that flag. The baker has three options for this flag: ``Off`` to +request ending the subsidy, ``On`` to request continuing or restarting +the subsidy, and ``Pass`` to abstain. ``e[n+1] = e[n]`` if the flag is set to ``Pass``. ``e[n+1] = (1999 * e[n] // 2000) + 1_000_000`` if the flag is set to ``Off``. diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index f2ad386e912e..e9296c8cc2ce 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -187,6 +187,11 @@ Data Availability Layer (ongoing) Distribution of rollup operations data off-chain. (MRs :gl:`!5711`, :gl:`!5938`, :gl:`!6024`, :gl:`!5959`) +Liquidity Baking +------------------ + +The ``liquidity_baking_sunset_level`` parameter has been removed since the subsidy +can now be shut off with the toggle introduced in Jakarta. (MR :gl:`!6215`) Breaking Changes ---------------- -- GitLab From 2bb4b4f30b6ad23ff9d7ff1c81fb5cfc3abd837f Mon Sep 17 00:00:00 2001 From: Sophia Gold Date: Tue, 30 Aug 2022 13:39:59 -0400 Subject: [PATCH 4/4] Tests/liquidity baking: update RPC regressions after removing sunset --- ...pha- (mode client) RPC regression tests- misc_protocol.out | 2 +- ...lpha- (mode light) RPC regression tests- misc_protocol.out | 2 +- ...lpha- (mode proxy) RPC regression tests- misc_protocol.out | 2 +- ...y_server_data_dir) RPC regression tests- misc_protocol.out | 2 +- ... proxy_server_rpc) RPC regression tests- misc_protocol.out | 2 +- ... - correct handling of commitments (no_commitment_publ.out | 4 ++-- ... node - correct handling of commitments (no_commitment.out | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) 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 4b7bfce805f5..01667c16b6b8 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 @@ -19,7 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "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- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out index edca068fe4d4..64467b125187 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 @@ -19,7 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "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- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out index b1a503fbc82b..29b15e2ad97e 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 @@ -19,7 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "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- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out index 145023ae968d..3b937e877a92 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 @@ -19,7 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "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- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out index 145023ae968d..3b937e877a92 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 @@ -19,7 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out index b2b3dbdbb69f..cc7d98862729 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - rollup node - correct handling of commitments (no_commitment_publ.out @@ -75,7 +75,7 @@ This sequence of operations was run: "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, @@ -185,7 +185,7 @@ This sequence of operations was run: "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out index 2cec2632b274..f65be7e99657 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - rollup node - correct handling of commitments (no_commitment.out @@ -75,7 +75,7 @@ This sequence of operations was run: "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, @@ -185,7 +185,7 @@ This sequence of operations was run: "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, -- GitLab