From 0d69e468b5b1f15f2bd8bd0943ca4da418b719aa Mon Sep 17 00:00:00 2001
From: Eugen Zalinescu <eugen.zalinescu@nomadic-labs.com>
Date: Thu, 20 Feb 2025 08:54:42 +0100
Subject: [PATCH 1/2] DAL/Node: do not warn because of traps if incentives FF
 not set

---
 src/bin_dal_node/daemon.ml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bin_dal_node/daemon.ml b/src/bin_dal_node/daemon.ml
index 2037bfb03118..7c065c36e057 100644
--- a/src/bin_dal_node/daemon.ml
+++ b/src/bin_dal_node/daemon.ml
@@ -537,14 +537,17 @@ module Handler = struct
                           should_be_attested index
                           && not (is_attested bitset index)
                         then
-                          if not (contains_traps delegate index) then
-                            Event.emit_warn_attester_did_not_attest_slot
+                          if
+                            parameters.incentives_enable
+                            && contains_traps delegate index
+                          then
+                            Event
+                            .emit_attester_did_not_attest_slot_because_of_traps
                               ~attester:delegate
                               ~slot_index:index
                               ~attested_level:block_level
                           else
-                            Event
-                            .emit_attester_did_not_attest_slot_because_of_traps
+                            Event.emit_warn_attester_did_not_attest_slot
                               ~attester:delegate
                               ~slot_index:index
                               ~attested_level:block_level
-- 
GitLab


From 70adddccfa1e2e0108b5f4096f57a0b58b3e6531 Mon Sep 17 00:00:00 2001
From: Eugen Zalinescu <eugen.zalinescu@nomadic-labs.com>
Date: Thu, 20 Feb 2025 14:02:07 +0100
Subject: [PATCH 2/2] DAL/Node: add reference to issue

---
 src/bin_dal_node/slot_manager.ml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bin_dal_node/slot_manager.ml b/src/bin_dal_node/slot_manager.ml
index e08486435bd2..24b9427d7e7c 100644
--- a/src/bin_dal_node/slot_manager.ml
+++ b/src/bin_dal_node/slot_manager.ml
@@ -316,6 +316,10 @@ let publish_proved_shards ctxt (slot_id : Types.slot_id) ~level_committee
              in
              let store = Node_context.get_store ctxt in
              let traps_store = Store.traps store in
+             (* TODO: https://gitlab.com/tezos/tezos/-/issues/7742
+                The [proto_parameters] are those for the last known finalized
+                level, which may differ from those of the slot level. This will
+                be an issue when the value of the [traps_fraction] changes.*)
              let traps_fraction = proto_parameters.traps_fraction in
              let () =
                maybe_register_trap
-- 
GitLab