From 905697a3db44a3300f9fe626565ced2549764d75 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Tue, 21 Oct 2025 20:53:41 +0200 Subject: [PATCH] Rollup/DAL: remove useless calls to compute a published level that is already given --- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- .../lib_sc_rollup_node/dal_pages_request.ml | 18 +++++------------- 9 files changed, 45 insertions(+), 117 deletions(-) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.ml index a7de9eb2adbd..7424e66d0261 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dal_pages_request.ml @@ -89,21 +89,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} let storage_invariant_broken published_level index = failwith diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_018_Proxford/lib_sc_rollup_node/dal_pages_request.ml index 027bf6eb70ec..ea0386a2f688 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dal_pages_request.ml @@ -124,21 +124,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} let storage_invariant_broken published_level index = failwith diff --git a/src/proto_019_PtParisB/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_019_PtParisB/lib_sc_rollup_node/dal_pages_request.ml index 6875d3cf150d..06e643412223 100644 --- a/src/proto_019_PtParisB/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_019_PtParisB/lib_sc_rollup_node/dal_pages_request.ml @@ -124,21 +124,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} let storage_invariant_broken published_level index = failwith diff --git a/src/proto_020_PsParisC/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_020_PsParisC/lib_sc_rollup_node/dal_pages_request.ml index 6875d3cf150d..06e643412223 100644 --- a/src/proto_020_PsParisC/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_020_PsParisC/lib_sc_rollup_node/dal_pages_request.ml @@ -124,21 +124,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} let storage_invariant_broken published_level index = failwith diff --git a/src/proto_021_PsQuebec/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_021_PsQuebec/lib_sc_rollup_node/dal_pages_request.ml index 6875d3cf150d..06e643412223 100644 --- a/src/proto_021_PsQuebec/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_021_PsQuebec/lib_sc_rollup_node/dal_pages_request.ml @@ -124,21 +124,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} let storage_invariant_broken published_level index = failwith diff --git a/src/proto_022_PsRiotum/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_022_PsRiotum/lib_sc_rollup_node/dal_pages_request.ml index 921b7077b475..8c849681ea62 100644 --- a/src/proto_022_PsRiotum/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_022_PsRiotum/lib_sc_rollup_node/dal_pages_request.ml @@ -107,21 +107,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Environment.Error_monad.Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} module Slots_statuses_cache = Aches.Vache.Map (Aches.Vache.FIFO_Precise) (Aches.Vache.Strong) diff --git a/src/proto_023_PtSeouLo/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_023_PtSeouLo/lib_sc_rollup_node/dal_pages_request.ml index 921b7077b475..8c849681ea62 100644 --- a/src/proto_023_PtSeouLo/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_023_PtSeouLo/lib_sc_rollup_node/dal_pages_request.ml @@ -107,21 +107,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Environment.Error_monad.Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} module Slots_statuses_cache = Aches.Vache.Map (Aches.Vache.FIFO_Precise) (Aches.Vache.Strong) diff --git a/src/proto_024_PsD5wVTJ/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_024_PsD5wVTJ/lib_sc_rollup_node/dal_pages_request.ml index 921b7077b475..8c849681ea62 100644 --- a/src/proto_024_PsD5wVTJ/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_024_PsD5wVTJ/lib_sc_rollup_node/dal_pages_request.ml @@ -107,21 +107,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Environment.Error_monad.Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} module Slots_statuses_cache = Aches.Vache.Map (Aches.Vache.FIFO_Precise) (Aches.Vache.Strong) diff --git a/src/proto_alpha/lib_sc_rollup_node/dal_pages_request.ml b/src/proto_alpha/lib_sc_rollup_node/dal_pages_request.ml index 1166b385e8c1..d7d8c03b5ffa 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dal_pages_request.ml +++ b/src/proto_alpha/lib_sc_rollup_node/dal_pages_request.ml @@ -107,21 +107,13 @@ let get_slot_pages = (Dal_node_client.get_slot_pages dal_cctxt) Lwt.return -let download_confirmed_slot_pages ({Node_context.dal_cctxt; _} as node_ctxt) - ~published_level ~index = - let open Environment.Error_monad.Lwt_result_syntax in - let* published_in_block_hash = - Node_context.hash_of_level node_ctxt (Raw_level.to_int32 published_level) - in - let* header = - Node_context.get_slot_header node_ctxt ~published_in_block_hash index - in +let download_confirmed_slot_pages {Node_context.dal_cctxt; _} ~published_level + ~index = let dal_cctxt = WithExceptions.Option.get ~loc:__LOC__ dal_cctxt in (* DAL must be configured for this point to be reached *) - let slot_id : Slot_id.t = - {slot_level = header.id.published_level; slot_index = header.id.index} - in - get_slot_pages dal_cctxt slot_id + get_slot_pages + dal_cctxt + {slot_level = Raw_level.to_int32 published_level; slot_index = index} module Slots_statuses_cache = Aches.Vache.Map (Aches.Vache.FIFO_Precise) (Aches.Vache.Strong) -- GitLab