From 470c632eb073875473e9cbe12bde50c756b8009d Mon Sep 17 00:00:00 2001 From: Lucas Randazzo Date: Fri, 23 Feb 2024 14:12:59 +0100 Subject: [PATCH 1/2] Proto/ema: reset ai ema at proto p activation --- src/proto_alpha/lib_protocol/init_storage.ml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/proto_alpha/lib_protocol/init_storage.ml b/src/proto_alpha/lib_protocol/init_storage.ml index 3cd96bd70696..020f518cf36d 100644 --- a/src/proto_alpha/lib_protocol/init_storage.ml +++ b/src/proto_alpha/lib_protocol/init_storage.ml @@ -222,6 +222,9 @@ let cleanup_values_for_protocol_p ctxt in return ctxt +let reset_adaptive_issuance_ema_for_p ctxt = + Storage.Adaptive_issuance.Launch_ema.add ctxt 0l + (** Updates the total supply with refined estimation at the activation of P using measures from https://gitlab.com/tezos/tezos/-/merge_requests/11978. @@ -344,6 +347,7 @@ let prepare_first_block chain_id ctxt ~typecheck_smart_contract cleanup_values_for_protocol_p ctxt previous_proto_constants level in let* ctxt = update_total_supply_for_p chain_id ctxt in + let*! ctxt = reset_adaptive_issuance_ema_for_p ctxt in return (ctxt, []) in let* ctxt = -- GitLab From 5aad0287de5b59788bc4d314139cee43b25bbd7e Mon Sep 17 00:00:00 2001 From: Lucas Randazzo Date: Mon, 4 Mar 2024 16:02:15 +0100 Subject: [PATCH 2/2] Doc/Proto: update changelog --- docs/protocols/alpha.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index d8b19e59f101..3903785abab6 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -98,7 +98,7 @@ Adaptive Issuance (ongoing) a strong incentive against potential consensus attacks. (MR :gl:`!11854`) -- Activating adaptive issuance per-block vote (MR :gl:`!11935`) +- Activating adaptive issuance per-block vote (MR :gl:`!11935`, :gl:`!12169`) - Adjust total supply tracked for AI (estimated in O) so that it matches the actual total supply. (MR :gl:`!11996`) -- GitLab