From 8055682ba07b27197044f2a08d4e92dc66c64a0e Mon Sep 17 00:00:00 2001
From: Mathias Bourgoin <mathias.bourgoin@nomadic-labs.com>
Date: Tue, 13 Feb 2024 21:17:28 +0100
Subject: [PATCH 1/2] proto: Update total_supply during stitching

Closes #6102
---
 src/proto_alpha/lib_protocol/init_storage.ml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/proto_alpha/lib_protocol/init_storage.ml b/src/proto_alpha/lib_protocol/init_storage.ml
index 911147c4ee29..8ba5ecaddcce 100644
--- a/src/proto_alpha/lib_protocol/init_storage.ml
+++ b/src/proto_alpha/lib_protocol/init_storage.ml
@@ -222,6 +222,23 @@ let cleanup_values_for_protocol_p ctxt
   in
   return ctxt
 
+(** Updates the total supply with refined estimation at the activation
+    of P using measures from
+    https://gitlab.com/tezos/tezos/-/merge_requests/11978.
+
+    Remove me in Q. *)
+let update_total_supply_for_p chain_id ctxt =
+  let open Lwt_result_syntax in
+  (* We only update the total supply for mainnet. *)
+  if Chain_id.equal Constants_repr.mainnet_id chain_id then
+    let* current_total_supply = Storage.Contract.Total_supply.get ctxt in
+    let*? updated_total_supply =
+      Tez_repr.(current_total_supply +? of_mutez_exn 16458634911983L)
+    in
+    let*! ctxt = Storage.Contract.Total_supply.add ctxt updated_total_supply in
+    return ctxt
+  else return ctxt
+
 let prepare_first_block chain_id ctxt ~typecheck_smart_contract
     ~typecheck_smart_rollup ~level ~timestamp ~predecessor =
   let open Lwt_result_syntax in
@@ -330,6 +347,7 @@ let prepare_first_block chain_id ctxt ~typecheck_smart_contract
         let*! ctxt =
           Delegate_slashed_deposits_storage.update_slashing_storage_for_p ctxt
         in
+        let* ctxt = update_total_supply_for_p chain_id ctxt in
         return (ctxt, [])
   in
   let* ctxt =
-- 
GitLab


From ee5365e9e0b54414126c39e212a05ed59212cf7a Mon Sep 17 00:00:00 2001
From: Mathias Bourgoin <mathias.bourgoin@nomadic-labs.com>
Date: Thu, 15 Feb 2024 11:35:50 +0100
Subject: [PATCH 2/2] docs/proto: update alpha changelog

---
 docs/protocols/alpha.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst
index 647d5a36559d..a07f7df6a611 100644
--- a/docs/protocols/alpha.rst
+++ b/docs/protocols/alpha.rst
@@ -98,6 +98,9 @@ Adaptive Issuance (ongoing)
 
 - Activating adaptive issuance per-block vote (MR !11935)
 
+- Adjust total supply tracked for AI (estimated in O) so that it matches the
+  actual total supply. (MR :gl:`!11996`)
+
 Gas improvements
 ----------------
 
-- 
GitLab