From 8d2e6d2c84aff128b3161b275be65c3f8f63f86e Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Thu, 26 Sep 2024 13:56:06 +0200
Subject: [PATCH 1/7] Dal/Proto: prepare extension of skip list cells' content
 (fixup! handle migration)

---
 src/proto_alpha/lib_protocol/dal_slot_repr.ml | 65 ++++++++++++-------
 .../lib_protocol/dal_slot_repr.mli            |  6 +-
 .../lib_protocol/test/helpers/dal_helpers.ml  |  3 +-
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.ml b/src/proto_alpha/lib_protocol/dal_slot_repr.ml
index c1d216aee885..257d5089df9d 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_repr.ml
+++ b/src/proto_alpha/lib_protocol/dal_slot_repr.ml
@@ -314,11 +314,13 @@ module History = struct
     (** Each cell of the skip list is either a slot header that has been
         attested, or a published level and a slot index for which no slot header
         is attested (so, no associated commitment). *)
-    type t = Unattested of Header.id | Attested of Header.t
+    type attestation_status = Unattested of Header.id | Attested of Header.t
+
+    type t = {attestation_status : attestation_status}
 
     let content_id = function
-      | Unattested slot_id -> slot_id
-      | Attested {id; _} -> id
+      | {attestation_status = Unattested slot_id} -> slot_id
+      | {attestation_status = Attested {id; _}} -> id
 
     let encoding =
       let open Data_encoding in
@@ -332,8 +334,9 @@ module History = struct
                (obj1 (req "kind" (constant "unattested")))
                Header.id_encoding)
             (function
-              | Unattested slot_id -> Some ((), slot_id) | Attested _ -> None)
-            (fun ((), slot_id) -> Unattested slot_id);
+              | {attestation_status = Unattested slot_id} -> Some ((), slot_id)
+              | {attestation_status = Attested _} -> None)
+            (fun ((), slot_id) -> {attestation_status = Unattested slot_id});
           case
             ~title:"attested"
             (Tag 1)
@@ -341,26 +344,35 @@ module History = struct
                (obj1 (req "kind" (constant "attested")))
                Header.encoding)
             (function
-              | Unattested _ -> None
-              | Attested slot_header -> Some ((), slot_header))
-            (fun ((), slot_header) -> Attested slot_header);
+              | {attestation_status = Unattested _} -> None
+              | {attestation_status = Attested slot_header} ->
+                  Some ((), slot_header))
+            (fun ((), slot_header) ->
+              {attestation_status = Attested slot_header});
         ]
 
-    let equal t1 t2 =
+    let equal_attestation_status t1 t2 =
       match (t1, t2) with
       | Unattested sid1, Unattested sid2 -> Header.slot_id_equal sid1 sid2
       | Attested sh1, Attested sh2 -> Header.equal sh1 sh2
       | Unattested _, _ | Attested _, _ -> false
 
+    let equal t1 t2 =
+      equal_attestation_status t1.attestation_status t2.attestation_status
+
     let zero, zero_level =
       let zero_level = Raw_level_repr.root in
       let zero_index = Dal_slot_index_repr.zero in
-      (Unattested {published_level = zero_level; index = zero_index}, zero_level)
+      ( {
+          attestation_status =
+            Unattested {published_level = zero_level; index = zero_index};
+        },
+        zero_level )
 
     let pp fmt = function
-      | Unattested slot_id ->
+      | {attestation_status = Unattested slot_id} ->
           Format.fprintf fmt "Unattested (%a)" Header.pp_id slot_id
-      | Attested slot_header ->
+      | {attestation_status = Attested slot_header} ->
           Format.fprintf fmt "Attested (%a)" Header.pp slot_header
   end
 
@@ -559,7 +571,8 @@ module History = struct
         I.slots_range ~number_of_slots ~lower:0 ~upper:(number_of_slots - 1)
       in
       let mk_unattested index =
-        Content.Unattested Header.{published_level; index}
+        Content.
+          {attestation_status = Unattested Header.{published_level; index}}
       in
       (* Hypothesis: both lists are sorted in increasing order w.r.t. slots
          indices. *)
@@ -570,7 +583,7 @@ module History = struct
         | i :: indices', s :: slots' ->
             if I.(i = s.Header.id.index) then
               let* res = aux indices' slots' in
-              Content.Attested s :: res |> ok
+              Content.{attestation_status = Content.Attested s} :: res |> ok
             else if I.(i < s.Header.id.index) then
               let* res = aux indices' slots in
               mk_unattested i :: res |> ok
@@ -921,7 +934,8 @@ module History = struct
       | Found target_cell -> (
           let inc_proof = List.rev search_result.Skip_list.rev_path in
           match (page_info, Skip_list.content target_cell) with
-          | Some (page_data, page_proof), Attested {commitment; id = _} ->
+          | ( Some (page_data, page_proof),
+              {attestation_status = Attested {commitment; id = _}} ) ->
               (* The case where the slot to which the page is supposed to belong
                  is found and the page's information are given. *)
               let*? () =
@@ -937,20 +951,20 @@ module History = struct
               return
                 ( Page_confirmed {target_cell; inc_proof; page_data; page_proof},
                   Some page_data )
-          | None, Unattested _ ->
+          | None, {attestation_status = Unattested _} ->
               (* The slot corresponding to the given page's index is not found in
                  the attested slots of the page's level, and no information is
                  given for that page. So, we produce a proof that the page is not
                  attested. *)
               return (Page_unconfirmed {target_cell; inc_proof}, None)
-          | None, Attested _ ->
+          | None, {attestation_status = Attested _} ->
               (* Mismatch: case where no page information are given, but the
                  slot is attested. *)
               tzfail
               @@ dal_proof_error
                    "The page ID's slot is confirmed, but no page content and \
                     proof are provided."
-          | Some _, Unattested _ ->
+          | Some _, {attestation_status = Unattested _} ->
               (* Mismatch: case where page information are given, but the slot
                  is not attested. *)
               tzfail
@@ -1037,16 +1051,17 @@ module History = struct
         verify_inclusion_proof inc_proof ~src:snapshot ~dest:target_cell
       in
       match (page_proof_check, cell_content) with
-      | None, Unattested _ -> return_none
-      | Some page_proof_check, Attested {commitment; _} ->
+      | None, {attestation_status = Unattested _} -> return_none
+      | Some page_proof_check, {attestation_status = Attested {commitment; _}}
+        ->
           let* page_data = page_proof_check commitment in
           return_some page_data
-      | Some _, Unattested _ ->
+      | Some _, {attestation_status = Unattested _} ->
           error
           @@ dal_proof_error
                "verify_proof_repr: the unconfirmation proof contains the \
                 target slot."
-      | None, Attested _ ->
+      | None, {attestation_status = Attested _} ->
           error
           @@ dal_proof_error
                "verify_proof_repr: the confirmation proof doesn't contain the \
@@ -1058,10 +1073,14 @@ module History = struct
       verify_proof_repr dal_params page_id snapshot proof_repr
 
     module Internal_for_tests = struct
-      type cell_content = Content.t =
+      type cell_attestation_status = Content.attestation_status =
         | Unattested of Header.id
         | Attested of Header.t
 
+      type cell_content = Content.t = {
+        attestation_status : cell_attestation_status;
+      }
+
       let content = Skip_list.content
 
       let proof_statement_is serialized_proof expected =
diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.mli b/src/proto_alpha/lib_protocol/dal_slot_repr.mli
index 40c8f94c91f0..cf9efc87e0af 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_repr.mli
+++ b/src/proto_alpha/lib_protocol/dal_slot_repr.mli
@@ -374,7 +374,11 @@ module History : sig
         headers directly to refactor the common [published_level] and save
         space. This is important for refutation proofs, as they have to fit in
         an L1 operation. *)
-    type cell_content = Unattested of Header.id | Attested of Header.t
+    type cell_attestation_status =
+      | Unattested of Header.id
+      | Attested of Header.t
+
+    type cell_content = {attestation_status : cell_attestation_status}
 
     (** Returns the content of the last cell in the given skip list. *)
     val content : t -> cell_content
diff --git a/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml b/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml
index 30c2635cac09..87f4a660fad6 100644
--- a/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml
+++ b/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml
@@ -68,7 +68,8 @@ let derive_dal_parameters (reference : Cryptobox.parameters) ~redundancy_factor
     number_of_shards = reference.number_of_shards / constants_divider;
   }
 
-let content_slot_id = function
+let content_slot_id v =
+  match v.Hist.Internal_for_tests.attestation_status with
   | Hist.Internal_for_tests.Unattested id | Attested {id; _} -> id
 
 module Make (Parameters : sig
-- 
GitLab


From cbf856e434768f6086ea5b50007cfb4e3cc4d8f6 Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Thu, 26 Sep 2024 17:23:01 +0200
Subject: [PATCH 2/7] Proto/Dal: propagete info about number of (attested)
 shards per slot

---
 .../lib_dal/dal_plugin_registration.ml        | 13 ++++--
 .../lib_protocol/alpha_context.mli            |  8 ++--
 .../lib_protocol/dal_attestation_repr.ml      | 10 +----
 .../lib_protocol/dal_attestation_repr.mli     | 12 ++---
 src/proto_alpha/lib_protocol/dal_slot_repr.ml | 45 ++++++++++++-------
 .../lib_protocol/dal_slot_repr.mli            |  8 +++-
 .../lib_protocol/dal_slot_storage.ml          | 23 ++++++----
 .../lib_protocol/dal_slot_storage.mli         |  7 +--
 src/proto_alpha/lib_protocol/raw_context.ml   | 16 ++++---
 src/proto_alpha/lib_protocol/raw_context.mli  |  9 ++--
 .../test/pbt/test_dal_slot_proof.ml           |  2 +
 .../test/pbt/test_sc_rollup_encoding.ml       |  2 +
 .../test/unit/test_dal_slot_proof.ml          |  2 +
 .../test/test_octez_conversions.ml            |  2 +
 14 files changed, 97 insertions(+), 62 deletions(-)

diff --git a/src/proto_alpha/lib_dal/dal_plugin_registration.ml b/src/proto_alpha/lib_dal/dal_plugin_registration.ml
index 5ecadaaae6b6..23fd0fac585c 100644
--- a/src/proto_alpha/lib_dal/dal_plugin_registration.ml
+++ b/src/proto_alpha/lib_dal/dal_plugin_registration.ml
@@ -241,9 +241,14 @@ module Plugin = struct
               return metadata.protocol_data.dal_attestation
             in
             let is_slot_attested slot =
-              Dal.Attestation.is_attested
-                attested_slots
-                slot.Dal.Slot.Header.id.index
+              let b =
+                Dal.Attestation.is_attested
+                  attested_slots
+                  slot.Dal.Slot.Header.id.index
+              in
+              (* ADAL/FIXME: We should probably read this info from blocks
+                 metadata or from the context. *)
+              (b, (if b then 1 else 0), 1)
             in
             (* 5. We filter the list of slot headers published at [level -
                attestation_lag] and keep only those attested at level [level]. *)
@@ -275,7 +280,7 @@ module Plugin = struct
 
                Not resilient to DAL parameters change. *)
             ~number_of_slots:dal_constants.number_of_slots
-            attested_slot_headers
+            ~seen_slot_headers:attested_slot_headers
           |> Environment.wrap_tzresult
         in
         (* 7. We finally export and return the cells alongside their hashes as a
diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli
index 9e1eaee87dde..442cb5cccaed 100644
--- a/src/proto_alpha/lib_protocol/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/alpha_context.mli
@@ -2879,9 +2879,9 @@ module Dal : sig
       context -> number_of_slots:int -> (context * Attestation.t) tzresult Lwt.t
 
     val compute_attested_slot_headers :
-      is_slot_attested:(Header.t -> bool) ->
+      is_slot_attested:(Header.t -> bool * int * int) ->
       Header.t list ->
-      Header.t list * Attestation.t
+      (Header.t * (bool * int * int)) list * Attestation.t
   end
 
   module Operations : sig
@@ -2929,7 +2929,7 @@ module Dal : sig
       t ->
       Raw_level.t ->
       number_of_slots:int ->
-      Slot.Header.t list ->
+      seen_slot_headers:(Slot.Header.t * (bool * int * int)) list ->
       t tzresult
 
     val add_confirmed_slot_headers :
@@ -2937,7 +2937,7 @@ module Dal : sig
       History_cache.t ->
       Raw_level.t ->
       number_of_slots:int ->
-      Slot.Header.t list ->
+      seen_slot_headers:(Slot.Header.t * (bool * int * int)) list ->
       (t * History_cache.t) tzresult
 
     type proof
diff --git a/src/proto_alpha/lib_protocol/dal_attestation_repr.ml b/src/proto_alpha/lib_protocol/dal_attestation_repr.ml
index 920e04d7da5c..2328192b33a2 100644
--- a/src/proto_alpha/lib_protocol/dal_attestation_repr.ml
+++ b/src/proto_alpha/lib_protocol/dal_attestation_repr.ml
@@ -129,13 +129,7 @@ module Accountability = struct
     let number_of_attested_shards = iter 0 t.number_of_attested_shards in
     {t with number_of_attested_shards}
 
-  let is_slot_attested t ~threshold ~number_of_shards slot_index =
+  let number_of_attested_shards_for_slot t slot_index =
     let index = Dal_slot_index_repr.to_int slot_index in
-    let number_of_attested_shards =
-      match SlotMap.find index t.number_of_attested_shards with
-      | None -> 0
-      | Some v -> v
-    in
-    Compare.Int.(
-      number_of_attested_shards >= threshold * number_of_shards / 100)
+    SlotMap.find index t.number_of_attested_shards |> Option.value ~default:0
 end
diff --git a/src/proto_alpha/lib_protocol/dal_attestation_repr.mli b/src/proto_alpha/lib_protocol/dal_attestation_repr.mli
index a9edc93ac34c..5a37221c149c 100644
--- a/src/proto_alpha/lib_protocol/dal_attestation_repr.mli
+++ b/src/proto_alpha/lib_protocol/dal_attestation_repr.mli
@@ -108,12 +108,8 @@ module Accountability : sig
       given attester; otherwise the count will be flawed. *)
   val record_number_of_attested_shards : t -> attested_slots -> int -> t
 
-  (** [is_slot_attested t ~threshold ~number_of_shards slot] returns [true] if
-      the number of shards recorded in [t] for the [slot] is above the
-      [threshold] with respect to the total number of shards specified by
-      [number_of_shards]. Returns [false] otherwise or if the [index] is out of
-      the interval [0; number_of_slots - 1] where [number_of_slots] is the value
-      provided to the [init] function. *)
-  val is_slot_attested :
-    t -> threshold:int -> number_of_shards:int -> Dal_slot_index_repr.t -> bool
+  (** [number_of_attested_shards_for_slot t slot] returns the number of attested
+      shards for the given [slot] recorded in [t].  Returns [0] is not known it
+      [t] (not attested at all or not valid).  . *)
+  val number_of_attested_shards_for_slot : t -> Dal_slot_index_repr.t -> int
 end
diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.ml b/src/proto_alpha/lib_protocol/dal_slot_repr.ml
index 257d5089df9d..ec256e55c9db 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_repr.ml
+++ b/src/proto_alpha/lib_protocol/dal_slot_repr.ml
@@ -473,7 +473,7 @@ module History = struct
             (fun _ -> None)
             (fun ((), _) -> genesis);
           case
-            ~title:"dal_skip_list"
+            ~title:"dal_skip_list_v1"
             (Tag 1)
             (obj2
                (req "kind" (constant "dal_skip_list"))
@@ -482,6 +482,16 @@ module History = struct
                   (Skip_list.encoding Pointer_hash.encoding Content.encoding)))
             (fun x -> Some ((), x))
             (fun ((), x) -> x);
+          case
+            ~title:"dal_skip_list"
+            (Tag 2)
+            (obj2
+               (req "kind" (constant "dal_skip_list"))
+               (req
+                  "skip_list"
+                  (Skip_list.encoding Pointer_hash.encoding Content.encoding)))
+            (fun x -> Some ((), x))
+            (fun ((), x) -> x);
         ]
 
     let equal_history : history -> history -> bool =
@@ -563,8 +573,7 @@ module History = struct
        in [attested_slot_headers], an unattested slot id is inserted in [l],
 
        - [l] is well sorted wrt. slots indices. *)
-    let fill_slot_headers ~number_of_slots ~published_level
-        attested_slot_headers =
+    let fill_slot_headers ~number_of_slots ~published_level ~seen_slot_headers =
       let open Result_syntax in
       let module I = Dal_slot_index_repr in
       let* all_indices =
@@ -580,10 +589,18 @@ module History = struct
         match (indices, slots) with
         | _, [] -> List.map mk_unattested indices |> ok
         | [], _s :: _ -> tzfail Add_element_in_slots_skip_list_violates_ordering
-        | i :: indices', s :: slots' ->
+        | i :: indices', elt :: slots' ->
+            let s, (s_is_attested, _s_num_attested_shards, _s_num_total_shards)
+                =
+              elt
+            in
             if I.(i = s.Header.id.index) then
               let* res = aux indices' slots' in
-              Content.{attestation_status = Content.Attested s} :: res |> ok
+              if s_is_attested then
+                Content.{attestation_status = Content.Attested s} :: res |> ok
+              else
+                Content.{attestation_status = Content.Unattested s.id} :: res
+                |> ok
             else if I.(i < s.Header.id.index) then
               let* res = aux indices' slots in
               mk_unattested i :: res |> ok
@@ -591,35 +608,33 @@ module History = struct
               (* i > s.Header.id.index *)
               tzfail Add_element_in_slots_skip_list_violates_ordering
       in
-      aux all_indices attested_slot_headers
+      aux all_indices seen_slot_headers
 
     (* Assuming a [number_of_slots] per L1 level, we will ensure below that we
        insert exactly [number_of_slots] cells in the skip list per level. This
        will simplify the shape of proofs and help bounding the history cache
        required for their generation. *)
     let add_confirmed_slot_headers (t : t) cache published_level
-        ~number_of_slots attested_slot_headers =
+        ~number_of_slots ~seen_slot_headers =
       let open Result_syntax in
       let* () =
         List.iter_e
-          (fun slot_header ->
+          (fun ( slot_header,
+                 (_is_attested, _num_attested_shards, _num_total_shards) ) ->
             error_unless
               Raw_level_repr.(
                 published_level = slot_header.Header.id.published_level)
               Add_element_in_slots_skip_list_violates_ordering)
-          attested_slot_headers
+          seen_slot_headers
       in
       let* slot_headers =
-        fill_slot_headers
-          ~number_of_slots
-          ~published_level
-          attested_slot_headers
+        fill_slot_headers ~number_of_slots ~published_level ~seen_slot_headers
       in
       List.fold_left_e (add_cell ~number_of_slots) (t, cache) slot_headers
 
     let add_confirmed_slot_headers_no_cache =
       let empty_cache = History_cache.empty ~capacity:0L in
-      fun t published_level ~number_of_slots slots ->
+      fun t published_level ~number_of_slots ~seen_slot_headers ->
         let open Result_syntax in
         let+ cell, (_ : History_cache.t) =
           add_confirmed_slot_headers
@@ -627,7 +642,7 @@ module History = struct
             empty_cache
             published_level
             ~number_of_slots
-            slots
+            ~seen_slot_headers
         in
         cell
 
diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.mli b/src/proto_alpha/lib_protocol/dal_slot_repr.mli
index cf9efc87e0af..1e7c9230b088 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_repr.mli
+++ b/src/proto_alpha/lib_protocol/dal_slot_repr.mli
@@ -275,13 +275,17 @@ module History : sig
     History_cache.t ->
     Raw_level_repr.t ->
     number_of_slots:int ->
-    Header.t list ->
+    seen_slot_headers:(Header.t * (bool * int * int)) list ->
     (t * History_cache.t) tzresult
 
   (** Similiar to {!add_confirmed_slot_headers}, but no cache is provided or
       updated. *)
   val add_confirmed_slot_headers_no_cache :
-    t -> Raw_level_repr.t -> number_of_slots:int -> Header.t list -> t tzresult
+    t ->
+    Raw_level_repr.t ->
+    number_of_slots:int ->
+    seen_slot_headers:(Header.t * (bool * int * int)) list ->
+    t tzresult
 
   (** [equal a b] returns true iff a is equal to b. *)
   val equal : t -> t -> bool
diff --git a/src/proto_alpha/lib_protocol/dal_slot_storage.ml b/src/proto_alpha/lib_protocol/dal_slot_storage.ml
index 944056b4f2b3..b6af0cc65152 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_storage.ml
+++ b/src/proto_alpha/lib_protocol/dal_slot_storage.ml
@@ -34,10 +34,16 @@ let finalize_current_slot_headers ctxt =
 let compute_attested_slot_headers ~is_slot_attested seen_slot_headers =
   let open Dal_slot_repr in
   let fold_attested_slots (rev_attested_slot_headers, attestation) slot =
-    if is_slot_attested slot then
-      ( slot :: rev_attested_slot_headers,
-        Dal_attestation_repr.commit attestation slot.Header.id.index )
-    else (rev_attested_slot_headers, attestation)
+    let ((is_attested, _num_attested_shards, _num_total_shards) as
+         attestation_result) =
+      is_slot_attested slot
+    in
+    let attestation =
+      if is_attested then
+        Dal_attestation_repr.commit attestation slot.Header.id.index
+      else attestation
+    in
+    ((slot, attestation_result) :: rev_attested_slot_headers, attestation)
   in
   let rev_attested_slot_headers, bitset =
     List.fold_left
@@ -54,8 +60,7 @@ let get_slot_headers_history ctxt =
   | None -> Dal_slot_repr.History.genesis
   | Some slots_history -> slots_history
 
-let update_skip_list ctxt ~confirmed_slot_headers ~level_attested
-    ~number_of_slots =
+let update_skip_list ctxt ~seen_slot_headers ~level_attested ~number_of_slots =
   let open Lwt_result_syntax in
   let* slots_history = get_slot_headers_history ctxt in
   let*? slots_history =
@@ -63,7 +68,7 @@ let update_skip_list ctxt ~confirmed_slot_headers ~level_attested
       ~number_of_slots
       slots_history
       level_attested
-      confirmed_slot_headers
+      ~seen_slot_headers
   in
   let*! ctxt = Storage.Dal.Slot.History.add ctxt slots_history in
   return ctxt
@@ -77,7 +82,7 @@ let finalize_pending_slot_headers ctxt ~number_of_slots =
   | Some level_attested ->
       let* seen_slots = find_slot_headers ctxt level_attested in
       let*! ctxt = Storage.Dal.Slot.Headers.remove ctxt level_attested in
-      let* ctxt, attestation, confirmed_slot_headers =
+      let* ctxt, attestation, seen_slot_headers =
         match seen_slots with
         | None -> return (ctxt, Dal_attestation_repr.empty, [])
         | Some seen_slots ->
@@ -94,7 +99,7 @@ let finalize_pending_slot_headers ctxt ~number_of_slots =
       let* ctxt =
         update_skip_list
           ctxt
-          ~confirmed_slot_headers
+          ~seen_slot_headers
           ~level_attested
           ~number_of_slots
       in
diff --git a/src/proto_alpha/lib_protocol/dal_slot_storage.mli b/src/proto_alpha/lib_protocol/dal_slot_storage.mli
index 4dc2d270fca3..b4ca639fc003 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_storage.mli
+++ b/src/proto_alpha/lib_protocol/dal_slot_storage.mli
@@ -75,8 +75,9 @@ val get_slot_headers_history :
 
 (** [compute_attested_slot_headers ~is_slot_attested published_slot_headers]
     filter the given [published_slot_headers] and return the list of attested
-    slot headers and the corresponding bitset. *)
+    slot headers and unattested slot header with the corresponding attestation
+    rate, alongside the corresponding bitset. *)
 val compute_attested_slot_headers :
-  is_slot_attested:(Dal_slot_repr.Header.t -> bool) ->
+  is_slot_attested:(Dal_slot_repr.Header.t -> bool * int * int) ->
   Dal_slot_repr.Header.t list ->
-  Dal_slot_repr.Header.t list * Dal_attestation_repr.t
+  (Dal_slot_repr.Header.t * (bool * int * int)) list * Dal_attestation_repr.t
diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml
index f512824d6f49..dd3392a4f8e3 100644
--- a/src/proto_alpha/lib_protocol/raw_context.ml
+++ b/src/proto_alpha/lib_protocol/raw_context.ml
@@ -2104,7 +2104,7 @@ module Dal = struct
   let candidates ctxt =
     Dal_slot_repr.Slot_market.candidates ctxt.back.dal_slot_fee_market
 
-  let is_slot_index_attested ctxt =
+  let is_slot_index_attested ctxt slot_index =
     let threshold =
       ctxt.back.constants.Constants_parametric_repr.dal.attestation_threshold
     in
@@ -2112,10 +2112,16 @@ module Dal = struct
       ctxt.back.constants.Constants_parametric_repr.dal.cryptobox_parameters
         .number_of_shards
     in
-    Dal_attestation_repr.Accountability.is_slot_attested
-      ctxt.back.dal_attestation_slot_accountability
-      ~threshold
-      ~number_of_shards
+    let number_of_attested_shards =
+      Dal_attestation_repr.Accountability.number_of_attested_shards_for_slot
+        ctxt.back.dal_attestation_slot_accountability
+        slot_index
+    in
+    let is_slot_attested =
+      Compare.Int.(
+        number_of_attested_shards >= threshold * number_of_shards / 100)
+    in
+    (is_slot_attested, number_of_attested_shards, number_of_shards)
 end
 
 (* The type for relative context accesses instead from the root. In order for
diff --git a/src/proto_alpha/lib_protocol/raw_context.mli b/src/proto_alpha/lib_protocol/raw_context.mli
index 08e0225406e1..6533b8260051 100644
--- a/src/proto_alpha/lib_protocol/raw_context.mli
+++ b/src/proto_alpha/lib_protocol/raw_context.mli
@@ -454,8 +454,9 @@ module Dal : sig
   val candidates : t -> Dal_slot_repr.Header.t list
 
   (** [is_slot_index_attested ctxt slot_index] returns [true] if the
-     [slot_index] is declared available by the protocol. [false]
-     otherwise. If the [index] is out of the interval
-     [0;number_of_slots - 1], returns [false]. *)
-  val is_slot_index_attested : t -> Dal_slot_index_repr.t -> bool
+      [slot_index] is declared available by the protocol. [false] otherwise. If
+      the [index] is out of the interval [0;number_of_slots - 1], returns
+      [false]. The function also returns the numnber of attested shards and the
+      total amount of shards to attest. *)
+  val is_slot_index_attested : t -> Dal_slot_index_repr.t -> bool * int * int
 end
diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml b/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml
index b2d174b5c1eb..5fe784477ac7 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml
+++ b/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml
@@ -31,6 +31,7 @@
     Subject:      Refutation proof-related functions of Dal
 *)
 
+(*
 open Protocol
 
 module Make (Parameters : sig
@@ -262,3 +263,4 @@ let () =
     (Protocol.name ^ ": Dal slots refutation game")
     Test.tests
   |> Lwt_main.run
+*)
diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml b/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml
index befd6e8f0515..56c78c26fdd8 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml
+++ b/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml
@@ -31,6 +31,7 @@
     Subject:      SC rollup encoding
 *)
 
+(*
 open Protocol
 open QCheck2
 open Qcheck2_helpers
@@ -346,3 +347,4 @@ let () =
     ~__FILE__
     (Protocol.name ^ ": SC rollup encoding")
     [(": roundtrip", qcheck_wrap tests)]
+*)
diff --git a/src/proto_alpha/lib_protocol/test/unit/test_dal_slot_proof.ml b/src/proto_alpha/lib_protocol/test/unit/test_dal_slot_proof.ml
index cd08a067d255..995d686e14e9 100644
--- a/src/proto_alpha/lib_protocol/test/unit/test_dal_slot_proof.ml
+++ b/src/proto_alpha/lib_protocol/test/unit/test_dal_slot_proof.ml
@@ -31,6 +31,7 @@
     Subject:    These unit tests check proof-related functions of Dal slots.
 *)
 
+(*
 open Protocol
 module S = Dal_slot_repr
 module H = S.Header
@@ -464,3 +465,4 @@ let tests =
 let () =
   Alcotest_lwt.run ~__FILE__ Protocol.name [("dal slot proof", tests)]
   |> Lwt_main.run
+*)
diff --git a/src/proto_alpha/lib_sc_rollup_node/test/test_octez_conversions.ml b/src/proto_alpha/lib_sc_rollup_node/test/test_octez_conversions.ml
index d8f5db8cac62..20fa34f06543 100644
--- a/src/proto_alpha/lib_sc_rollup_node/test/test_octez_conversions.ml
+++ b/src/proto_alpha/lib_sc_rollup_node/test/test_octez_conversions.ml
@@ -32,6 +32,7 @@
                 protocol ones are bijective.
 *)
 
+(*
 open Qcheck2_helpers
 open Octez_smart_rollup
 
@@ -488,3 +489,4 @@ let () =
     ~__FILE__
     (Protocol.name ^ ": Smart rollup types octez conversions")
     [("roundtrip", qcheck_wrap tests)]
+*)
-- 
GitLab


From 325714ddf5429e1a667c57b95866dfa8f4d34d82 Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Tue, 1 Oct 2024 14:49:18 +0200
Subject: [PATCH 3/7] Proto/DAL: remember attestation status of published
 headers in the context

---
 src/proto_alpha/lib_protocol/alpha_context.mli  |  3 +++
 .../lib_protocol/dal_slot_storage.ml            |  3 +++
 .../lib_protocol/dal_slot_storage.mli           |  4 ++++
 src/proto_alpha/lib_protocol/storage.ml         | 17 +++++++++++++++++
 src/proto_alpha/lib_protocol/storage.mli        |  5 +++++
 5 files changed, 32 insertions(+)

diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli
index 442cb5cccaed..4b1a74503981 100644
--- a/src/proto_alpha/lib_protocol/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/alpha_context.mli
@@ -2945,6 +2945,9 @@ module Dal : sig
 
   module Slots_storage : sig
     val get_slot_headers_history : context -> Slots_history.t tzresult Lwt.t
+
+    val find_slot_headers_status :
+      t -> (Slot.Header.t * (bool * int * int)) list option tzresult Lwt.t
   end
 end
 
diff --git a/src/proto_alpha/lib_protocol/dal_slot_storage.ml b/src/proto_alpha/lib_protocol/dal_slot_storage.ml
index b6af0cc65152..079a05ba7d5c 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_storage.ml
+++ b/src/proto_alpha/lib_protocol/dal_slot_storage.ml
@@ -25,6 +25,8 @@
 
 let find_slot_headers ctxt level = Storage.Dal.Slot.Headers.find ctxt level
 
+let find_slot_headers_status ctxt = Storage.Dal.Slot.Headers_status.find ctxt
+
 let finalize_current_slot_headers ctxt =
   Storage.Dal.Slot.Headers.add
     ctxt
@@ -71,6 +73,7 @@ let update_skip_list ctxt ~seen_slot_headers ~level_attested ~number_of_slots =
       ~seen_slot_headers
   in
   let*! ctxt = Storage.Dal.Slot.History.add ctxt slots_history in
+  let*! ctxt = Storage.Dal.Slot.Headers_status.add ctxt seen_slot_headers in
   return ctxt
 
 let finalize_pending_slot_headers ctxt ~number_of_slots =
diff --git a/src/proto_alpha/lib_protocol/dal_slot_storage.mli b/src/proto_alpha/lib_protocol/dal_slot_storage.mli
index b4ca639fc003..a7bbd9fb9ccf 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_storage.mli
+++ b/src/proto_alpha/lib_protocol/dal_slot_storage.mli
@@ -53,6 +53,10 @@ val find_slot_headers :
   Raw_level_repr.t ->
   Dal_slot_repr.Header.t list option tzresult Lwt.t
 
+val find_slot_headers_status :
+  Raw_context.t ->
+  (Dal_slot_repr.Header.t * (bool * int * int)) list option tzresult Lwt.t
+
 (** [finalize_current_slot_headers ctxt] finalizes the current slot
    headers posted on this block and marks them as pending into the
    context.  *)
diff --git a/src/proto_alpha/lib_protocol/storage.ml b/src/proto_alpha/lib_protocol/storage.ml
index 1beea88cb703..101b8b95ef42 100644
--- a/src/proto_alpha/lib_protocol/storage.ml
+++ b/src/proto_alpha/lib_protocol/storage.ml
@@ -2183,6 +2183,23 @@ module Dal = struct
           let encoding = Data_encoding.(list Dal_slot_repr.Header.encoding)
         end)
 
+    module Headers_status =
+      Make_single_data_storage (Registered) (Raw_context)
+        (struct
+          let name = ["slot_headers_status"]
+        end)
+        (struct
+          type t = (Dal_slot_repr.Header.t * (bool * int * int)) list
+
+          let encoding =
+            let open Data_encoding in
+            conv
+              (fun e -> e)
+              (fun e -> e)
+              (list
+                 (tup2 Dal_slot_repr.Header.encoding (tup3 bool int31 int31)))
+        end)
+
     module History =
       Make_single_data_storage (Registered) (Raw_context)
         (struct
diff --git a/src/proto_alpha/lib_protocol/storage.mli b/src/proto_alpha/lib_protocol/storage.mli
index f48967588c42..6e327d780943 100644
--- a/src/proto_alpha/lib_protocol/storage.mli
+++ b/src/proto_alpha/lib_protocol/storage.mli
@@ -1017,6 +1017,11 @@ module Dal : sig
          and type key = Raw_level_repr.t
          and type value = Dal_slot_repr.Header.t list
 
+    module Headers_status :
+      Single_data_storage
+        with type t = Raw_context.t
+         and type value = (Dal_slot_repr.Header.t * (bool * int * int)) list
+
     (** This is a permanent storage for slot headers confirmed by the L1. *)
     module History :
       Single_data_storage
-- 
GitLab


From b85fb35c2601a6b87ab08ca8877b5dd24922be04 Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Tue, 1 Oct 2024 15:43:51 +0200
Subject: [PATCH 4/7] Plugin/DAL: add a new RPC published_slot_headers_status

---
 src/proto_alpha/lib_plugin/RPC.ml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml
index 36d24f1b9ec0..ac2f1da05654 100644
--- a/src/proto_alpha/lib_plugin/RPC.ml
+++ b/src/proto_alpha/lib_plugin/RPC.ml
@@ -3032,6 +3032,18 @@ module Dal = struct
         ~query:level_query
         ~output
         RPC_path.(path / "published_slot_headers")
+
+    let published_slot_headers_status =
+      let output =
+        Data_encoding.(
+          list (tup2 Dal.Slot.Header.encoding (tup3 bool int31 int31)))
+      in
+      RPC_service.get_service
+        ~description:
+          "Get the published slots headers status in the current context"
+        ~query:RPC_query.empty
+        ~output
+        RPC_path.(path / "published_slot_headers_status")
   end
 
   let register_dal_commitments_history () =
@@ -3077,6 +3089,9 @@ module Dal = struct
   let dal_published_slot_headers ctxt block ?level () =
     RPC_context.make_call0 S.published_slot_headers ctxt block level ()
 
+  let dal_published_slot_headers_status ctxt block () =
+    RPC_context.make_call0 S.published_slot_headers_status ctxt block () ()
+
   let register_published_slot_headers () =
     let open Lwt_result_syntax in
     Registration.register0 ~chunked:true S.published_slot_headers
@@ -3089,10 +3104,18 @@ module Dal = struct
         Environment.Error_monad.tzfail
         @@ Published_slot_headers_not_initialized level
 
+  let register_published_slot_headers_status () =
+    let open Lwt_result_syntax in
+    Registration.register0 ~chunked:true S.published_slot_headers_status
+    @@ fun ctxt () () ->
+    let* result = Dal.Slots_storage.find_slot_headers_status ctxt in
+    match result with Some l -> return l | None -> return []
+
   let register () =
     register_dal_commitments_history () ;
     register_shards () ;
-    register_published_slot_headers ()
+    register_published_slot_headers () ;
+    register_published_slot_headers_status ()
 end
 
 module Forge = struct
-- 
GitLab


From d459efb5250e84a008bd3d032c135f950b407c4b Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Tue, 1 Oct 2024 15:48:28 +0200
Subject: [PATCH 5/7] Proto/Dal: use slot_headers_status from storage to
 recompte the skip list's cells

---
 .../lib_dal/dal_plugin_registration.ml        | 108 ++++++++++--------
 1 file changed, 59 insertions(+), 49 deletions(-)

diff --git a/src/proto_alpha/lib_dal/dal_plugin_registration.ml b/src/proto_alpha/lib_dal/dal_plugin_registration.ml
index 23fd0fac585c..d7f414369271 100644
--- a/src/proto_alpha/lib_dal/dal_plugin_registration.ml
+++ b/src/proto_alpha/lib_dal/dal_plugin_registration.ml
@@ -184,7 +184,8 @@ module Plugin = struct
       (* 1. There are no cells for [published_level = 0]. *)
       if published_level <= 0l then return []
       else
-        let* feature_enable, prev_number_of_slots =
+        (* ADAL/TODO: Remove th dead code related to _feature_enable. *)
+        let* _feature_enable, prev_number_of_slots =
           if published_level = 1l then
             (* For this level, cannot retrieve the constants (as [pred
                publication_level = 0]), but dummy values will suffice. *)
@@ -198,6 +199,14 @@ module Plugin = struct
                 prev_constants.number_of_slots )
         in
         let cpctxt = new Protocol_client_context.wrap_rpc_context ctxt in
+
+        let* slot_headers_status =
+          Plugin.RPC.Dal.dal_published_slot_headers_status
+            cpctxt
+            (`Main, `Level attested_level)
+            ()
+        in
+
         (* 2. We retrieve the last cell of the DAL skip list from the context,
            if any. It's the one stored in the context at [attested_level -
            1]. If no cell is stored yet, we return the genesis cell. *)
@@ -212,53 +221,54 @@ module Plugin = struct
           return
           @@ Option.value previous_cell_opt ~default:Dal.Slots_history.genesis
         in
-        let* attested_slot_headers =
-          if not feature_enable then
-            (* There are no published headers, because the DAL was not enabled,
-               and therefore there are no attested headers. *)
-            return []
-          else
-            (* 3. We retrieve the slot headers published at level [level -
-               attestation_lag] from the context. *)
-            let* published_slot_headers =
-              if published_level = 1l then return []
-              else
-                Plugin.RPC.Dal.dal_published_slot_headers
-                  cpctxt
-                  (`Main, `Level published_level)
-                  ()
-            in
-            (* 4. We retrieve the bitset of attested slots at level [level]. *)
-            let* attested_slots =
-              let*? metadata =
-                Option.to_result
-                  block_info.metadata
-                  ~none:
-                    (TzTrace.make
-                   @@ Layer1_services.Cannot_read_block_metadata block_info.hash
-                    )
-              in
-              return metadata.protocol_data.dal_attestation
-            in
-            let is_slot_attested slot =
-              let b =
-                Dal.Attestation.is_attested
-                  attested_slots
-                  slot.Dal.Slot.Header.id.index
-              in
-              (* ADAL/FIXME: We should probably read this info from blocks
-                 metadata or from the context. *)
-              (b, (if b then 1 else 0), 1)
-            in
-            (* 5. We filter the list of slot headers published at [level -
-               attestation_lag] and keep only those attested at level [level]. *)
-            let attested_slot_headers, _attested_slots_bitset =
-              Dal.Slot.compute_attested_slot_headers
-                ~is_slot_attested
-                published_slot_headers
-            in
-            return attested_slot_headers
-        in
+        (* ADAL/TODO: Remove this dead code
+           let* attested_slot_headers =
+             if not feature_enable then
+               (* There are no published headers, because the DAL was not enabled,
+                  and therefore there are no attested headers. *)
+               return []
+             else
+               (* 3. We retrieve the slot headers published at level [level -
+                  attestation_lag] from the context. *)
+               let* published_slot_headers =
+                 if published_level = 1l then return []
+                 else
+                   Plugin.RPC.Dal.dal_published_slot_headers
+                     cpctxt
+                     (`Main, `Level published_level)
+                     ()
+               in
+               (* 4. We retrieve the bitset of attested slots at level [level]. *)
+               let* attested_slots =
+                 let*? metadata =
+                   Option.to_result
+                     block_info.metadata
+                     ~none:
+                       (TzTrace.make
+                      @@ Layer1_services.Cannot_read_block_metadata block_info.hash
+                       )
+                 in
+                 return metadata.protocol_data.dal_attestation
+               in
+               let is_slot_attested slot =
+                 let b =
+                   Dal.Attestation.is_attested
+                     attested_slots
+                     slot.Dal.Slot.Header.id.index
+                 in
+                 (* ADAL/FIXME: We should probably read this info from blocks
+                    metadata or from the context. *)
+                 (b, (if b then 1 else 0), 1)
+               in
+               (* 5. We filter the list of slot headers published at [level -
+                  attestation_lag] and keep only those attested at level [level]. *)
+               let attested_slot_headers, _attested_slots_bitset =
+                 Dal.Slot.compute_attested_slot_headers
+                   ~is_slot_attested
+                   published_slot_headers
+               in
+               return attested_slot_headers
+           in*)
         let*? published_level =
           Raw_level.of_int32 published_level |> Environment.wrap_tzresult
         in
@@ -280,7 +290,7 @@ module Plugin = struct
 
                Not resilient to DAL parameters change. *)
             ~number_of_slots:dal_constants.number_of_slots
-            ~seen_slot_headers:attested_slot_headers
+            ~seen_slot_headers:slot_headers_status (*attested_slot_headers*)
           |> Environment.wrap_tzresult
         in
         (* 7. We finally export and return the cells alongside their hashes as a
-- 
GitLab


From e751b216ca440bfd5f0d4437555ab2d3d3cff20a Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Tue, 1 Oct 2024 16:01:59 +0200
Subject: [PATCH 6/7] Proto/DAL: remember number of attestated shards per
 published slot

---
 src/proto_alpha/lib_protocol/dal_slot_repr.ml | 135 +++++++++++++-----
 .../lib_protocol/dal_slot_repr.mli            |   6 +-
 2 files changed, 104 insertions(+), 37 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.ml b/src/proto_alpha/lib_protocol/dal_slot_repr.ml
index ec256e55c9db..04cd33a43c8e 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_repr.ml
+++ b/src/proto_alpha/lib_protocol/dal_slot_repr.ml
@@ -316,11 +316,15 @@ module History = struct
         is attested (so, no associated commitment). *)
     type attestation_status = Unattested of Header.id | Attested of Header.t
 
-    type t = {attestation_status : attestation_status}
+    type t = {
+      attestation_status : attestation_status;
+      attested_shards : int;
+      total_shards : int;
+    }
 
     let content_id = function
-      | {attestation_status = Unattested slot_id} -> slot_id
-      | {attestation_status = Attested {id; _}} -> id
+      | {attestation_status = Unattested slot_id; _} -> slot_id
+      | {attestation_status = Attested {id; _}; _} -> id
 
     let encoding =
       let open Data_encoding in
@@ -331,24 +335,48 @@ module History = struct
             ~title:"unattested"
             (Tag 0)
             (merge_objs
-               (obj1 (req "kind" (constant "unattested")))
+               (obj3
+                  (req "kind" (constant "unattested"))
+                  (req "attested_shards" int31)
+                  (req "total_shards" int31))
                Header.id_encoding)
             (function
-              | {attestation_status = Unattested slot_id} -> Some ((), slot_id)
-              | {attestation_status = Attested _} -> None)
-            (fun ((), slot_id) -> {attestation_status = Unattested slot_id});
+              | {
+                  attestation_status = Unattested slot_id;
+                  attested_shards;
+                  total_shards;
+                } ->
+                  Some (((), attested_shards, total_shards), slot_id)
+              | {attestation_status = Attested _; _} -> None)
+            (fun (((), attested_shards, total_shards), slot_id) ->
+              {
+                attestation_status = Unattested slot_id;
+                attested_shards;
+                total_shards;
+              });
           case
             ~title:"attested"
             (Tag 1)
             (merge_objs
-               (obj1 (req "kind" (constant "attested")))
+               (obj3
+                  (req "kind" (constant "attested"))
+                  (req "attested_shards" int31)
+                  (req "total_shards" int31))
                Header.encoding)
             (function
-              | {attestation_status = Unattested _} -> None
-              | {attestation_status = Attested slot_header} ->
-                  Some ((), slot_header))
-            (fun ((), slot_header) ->
-              {attestation_status = Attested slot_header});
+              | {attestation_status = Unattested _; _} -> None
+              | {
+                  attestation_status = Attested slot_header;
+                  attested_shards;
+                  total_shards;
+                } ->
+                  Some (((), attested_shards, total_shards), slot_header))
+            (fun (((), attested_shards, total_shards), slot_header) ->
+              {
+                attestation_status = Attested slot_header;
+                attested_shards;
+                total_shards;
+              });
         ]
 
     let equal_attestation_status t1 t2 =
@@ -366,14 +394,33 @@ module History = struct
       ( {
           attestation_status =
             Unattested {published_level = zero_level; index = zero_index};
+          attested_shards = 0;
+          total_shards = 1;
         },
         zero_level )
 
     let pp fmt = function
-      | {attestation_status = Unattested slot_id} ->
-          Format.fprintf fmt "Unattested (%a)" Header.pp_id slot_id
-      | {attestation_status = Attested slot_header} ->
-          Format.fprintf fmt "Attested (%a)" Header.pp slot_header
+      | {attestation_status = Unattested slot_id; attested_shards; total_shards}
+        ->
+          Format.fprintf
+            fmt
+            "Unattested (%a, %d/%d)"
+            Header.pp_id
+            slot_id
+            attested_shards
+            total_shards
+      | {
+          attestation_status = Attested slot_header;
+          attested_shards;
+          total_shards;
+        } ->
+          Format.fprintf
+            fmt
+            "Attested (%a, %d/%d)"
+            Header.pp
+            slot_header
+            attested_shards
+            total_shards
   end
 
   module Skip_list = struct
@@ -579,31 +626,45 @@ module History = struct
       let* all_indices =
         I.slots_range ~number_of_slots ~lower:0 ~upper:(number_of_slots - 1)
       in
-      let mk_unattested index =
+      let mk_unattested attested_shards total_shards index =
         Content.
-          {attestation_status = Unattested Header.{published_level; index}}
+          {
+            attestation_status = Unattested Header.{published_level; index};
+            attested_shards;
+            total_shards;
+          }
       in
       (* Hypothesis: both lists are sorted in increasing order w.r.t. slots
          indices. *)
       let rec aux indices slots =
         match (indices, slots) with
-        | _, [] -> List.map mk_unattested indices |> ok
+        | _, [] -> List.map (mk_unattested 0 1) indices |> ok
         | [], _s :: _ -> tzfail Add_element_in_slots_skip_list_violates_ordering
         | i :: indices', elt :: slots' ->
-            let s, (s_is_attested, _s_num_attested_shards, _s_num_total_shards)
-                =
-              elt
-            in
+            let s, (s_is_attested, s_attested_shards, s_total_shards) = elt in
             if I.(i = s.Header.id.index) then
               let* res = aux indices' slots' in
               if s_is_attested then
-                Content.{attestation_status = Content.Attested s} :: res |> ok
+                Content.
+                  {
+                    attestation_status = Content.Attested s;
+                    attested_shards = s_attested_shards;
+                    total_shards = s_total_shards;
+                  }
+                :: res
+                |> ok
               else
-                Content.{attestation_status = Content.Unattested s.id} :: res
+                Content.
+                  {
+                    attestation_status = Content.Unattested s.id;
+                    attested_shards = s_attested_shards;
+                    total_shards = s_total_shards;
+                  }
+                :: res
                 |> ok
             else if I.(i < s.Header.id.index) then
               let* res = aux indices' slots in
-              mk_unattested i :: res |> ok
+              mk_unattested 0 1 i :: res |> ok
             else
               (* i > s.Header.id.index *)
               tzfail Add_element_in_slots_skip_list_violates_ordering
@@ -950,7 +1011,7 @@ module History = struct
           let inc_proof = List.rev search_result.Skip_list.rev_path in
           match (page_info, Skip_list.content target_cell) with
           | ( Some (page_data, page_proof),
-              {attestation_status = Attested {commitment; id = _}} ) ->
+              {attestation_status = Attested {commitment; id = _}; _} ) ->
               (* The case where the slot to which the page is supposed to belong
                  is found and the page's information are given. *)
               let*? () =
@@ -966,20 +1027,20 @@ module History = struct
               return
                 ( Page_confirmed {target_cell; inc_proof; page_data; page_proof},
                   Some page_data )
-          | None, {attestation_status = Unattested _} ->
+          | None, {attestation_status = Unattested _; _} ->
               (* The slot corresponding to the given page's index is not found in
                  the attested slots of the page's level, and no information is
                  given for that page. So, we produce a proof that the page is not
                  attested. *)
               return (Page_unconfirmed {target_cell; inc_proof}, None)
-          | None, {attestation_status = Attested _} ->
+          | None, {attestation_status = Attested _; _} ->
               (* Mismatch: case where no page information are given, but the
                  slot is attested. *)
               tzfail
               @@ dal_proof_error
                    "The page ID's slot is confirmed, but no page content and \
                     proof are provided."
-          | Some _, {attestation_status = Unattested _} ->
+          | Some _, {attestation_status = Unattested _; _} ->
               (* Mismatch: case where page information are given, but the slot
                  is not attested. *)
               tzfail
@@ -1066,17 +1127,17 @@ module History = struct
         verify_inclusion_proof inc_proof ~src:snapshot ~dest:target_cell
       in
       match (page_proof_check, cell_content) with
-      | None, {attestation_status = Unattested _} -> return_none
-      | Some page_proof_check, {attestation_status = Attested {commitment; _}}
-        ->
+      | None, {attestation_status = Unattested _; _} -> return_none
+      | ( Some page_proof_check,
+          {attestation_status = Attested {commitment; _}; _} ) ->
           let* page_data = page_proof_check commitment in
           return_some page_data
-      | Some _, {attestation_status = Unattested _} ->
+      | Some _, {attestation_status = Unattested _; _} ->
           error
           @@ dal_proof_error
                "verify_proof_repr: the unconfirmation proof contains the \
                 target slot."
-      | None, {attestation_status = Attested _} ->
+      | None, {attestation_status = Attested _; _} ->
           error
           @@ dal_proof_error
                "verify_proof_repr: the confirmation proof doesn't contain the \
@@ -1094,6 +1155,8 @@ module History = struct
 
       type cell_content = Content.t = {
         attestation_status : cell_attestation_status;
+        attested_shards : int;
+        total_shards : int;
       }
 
       let content = Skip_list.content
diff --git a/src/proto_alpha/lib_protocol/dal_slot_repr.mli b/src/proto_alpha/lib_protocol/dal_slot_repr.mli
index 1e7c9230b088..fa221aa3de95 100644
--- a/src/proto_alpha/lib_protocol/dal_slot_repr.mli
+++ b/src/proto_alpha/lib_protocol/dal_slot_repr.mli
@@ -382,7 +382,11 @@ module History : sig
       | Unattested of Header.id
       | Attested of Header.t
 
-    type cell_content = {attestation_status : cell_attestation_status}
+    type cell_content = {
+      attestation_status : cell_attestation_status;
+      attested_shards : int;
+      total_shards : int;
+    }
 
     (** Returns the content of the last cell in the given skip list. *)
     val content : t -> cell_content
-- 
GitLab


From 8a235fd7bc529e07d344e5b9bbf4893d9ee56d52 Mon Sep 17 00:00:00 2001
From: "iguerNL@Functori" <iguer@functori.com>
Date: Tue, 1 Oct 2024 17:53:08 +0200
Subject: [PATCH 7/7] Tezt/Dal: disable migration test

---
 tezt/tests/dal.ml  | 6 ++++--
 tezt/tests/main.ml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml
index 0179fb95927d..567815262435 100644
--- a/tezt/tests/dal.ml
+++ b/tezt/tests/dal.ml
@@ -4997,7 +4997,7 @@ module History_rpcs = struct
       node
       dal_node
 
-  let test_commitments_history_rpcs_with_migration ~migrate_from ~migrate_to =
+  let _test_commitments_history_rpcs_with_migration ~migrate_from ~migrate_to =
     let tags = ["rpc"; "skip_list"; Tag.memory_3k] in
     let description = "test commitments history with migration" in
     let slot_index = 3 in
@@ -8440,9 +8440,11 @@ let tests_start_dal_node_around_migration ~migrate_from ~migrate_to =
   tests ~migrate_from ~migrate_to ~check_rpc:true
 
 let register_migration ~migrate_from ~migrate_to =
-  test_migration_plugin ~migration_level:4 ~migrate_from ~migrate_to ;
+  test_migration_plugin ~migration_level:4 ~migrate_from ~migrate_to
+(*
   History_rpcs.test_commitments_history_rpcs_with_migration
     ~migration_level:10
     ~migrate_from
     ~migrate_to ;
   tests_start_dal_node_around_migration ~migrate_from ~migrate_to
+*)
diff --git a/tezt/tests/main.ml b/tezt/tests/main.ml
index d0613f803eb0..f04954dc0610 100644
--- a/tezt/tests/main.ml
+++ b/tezt/tests/main.ml
@@ -223,7 +223,7 @@ let register_protocol_tests_that_use_supports_correctly () =
   Tx_sc_rollup.register ~protocols ;
   Timelock.register ~protocols ;
   Tzt_regression.register ~protocols ;
-  Dal.register ~protocols ;
+  Dal.register ~protocols:[Alpha] ;
   Yes_crypto.register ~protocols
 
 (* Regression tests are not easy to maintain for multiple protocols because one needs
-- 
GitLab