diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index d8b19e59f101fef496bbbc2212c27ba4732dbd3c..3903785abab669970aa7a3e65474e854bbe3b462 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`) diff --git a/src/proto_alpha/lib_protocol/init_storage.ml b/src/proto_alpha/lib_protocol/init_storage.ml index 3cd96bd706963924f50d79aea2896b9a2ebf2bd8..020f518cf36d1c43f13e6139d64a934e4f1b6453 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 =