From 0a27838dcf6b8c2cedf2eb24b2819b3db77e0102 Mon Sep 17 00:00:00 2001
From: Gabriel Moise <gabriel.moise@trili.tech>
Date: Mon, 31 Mar 2025 11:40:42 +0100
Subject: [PATCH 1/5] Tezt: Rename agnostic baker constant in tezt

---
 .../benchmark_tps_command.ml                  |  2 +-
 src/bin_tps_evaluation/gas_tps_command.ml     |  2 +-
 tezt/lib_tezos/agnostic_baker.ml              | 12 +++++-----
 tezt/lib_tezos/constant.ml                    |  7 ++----
 tezt/lib_tezos/vdf.ml                         |  2 +-
 tezt/long_tests/tenderbake.ml                 |  4 ++--
 tezt/manual_tests/baker_test.ml               |  2 +-
 tezt/manual_tests/dal.ml                      |  2 +-
 tezt/tests/agnostic_baker_test.ml             |  4 ++--
 tezt/tests/baker_operations_cli_options.ml    |  6 ++---
 tezt/tests/baker_test.ml                      | 22 +++++++++----------
 tezt/tests/cloud/dal.ml                       |  2 +-
 tezt/tests/cloud/tezos.ml                     |  4 ++--
 tezt/tests/dal.ml                             | 14 ++++++------
 tezt/tests/http_cache_headers.ml              |  2 +-
 .../tests/liquidity_baking_per_block_votes.ml |  2 +-
 tezt/tests/nonce_seed_revelation.ml           |  4 ++--
 tezt/tests/protocol_migration.ml              |  6 ++---
 tezt/tests/signer_test.ml                     |  2 +-
 tezt/tests/synchronisation_heuristic.ml       | 12 +++++-----
 tezt/tests/vdf_test.ml                        |  4 ++--
 tezt/tests/voting.ml                          |  3 +--
 22 files changed, 57 insertions(+), 63 deletions(-)

diff --git a/src/bin_tps_evaluation/benchmark_tps_command.ml b/src/bin_tps_evaluation/benchmark_tps_command.ml
index 997bc2bd4968..c2266285385a 100644
--- a/src/bin_tps_evaluation/benchmark_tps_command.ml
+++ b/src/bin_tps_evaluation/benchmark_tps_command.ml
@@ -297,7 +297,7 @@ let register () =
     ~tags:[Dashboard.Test.benchmark_tps]
     ~timeout:(Long_test.Minutes 60)
     ~executors:Long_test.[x86_executor1]
-    ~uses:[Tezt_wrapper.Uses.octez_experimental_agnostic_baker]
+    ~uses:[Tezt_wrapper.Uses.octez_agnostic_baker]
     (fun () ->
       let lift_protocol_limits =
         Cli.get_bool ~default:false "lift-protocol-limits"
diff --git a/src/bin_tps_evaluation/gas_tps_command.ml b/src/bin_tps_evaluation/gas_tps_command.ml
index e8a29d316d6f..71694c585134 100644
--- a/src/bin_tps_evaluation/gas_tps_command.ml
+++ b/src/bin_tps_evaluation/gas_tps_command.ml
@@ -82,7 +82,7 @@ let register () =
     ~tags:[Dashboard.Test.gas_tps]
     ~timeout:(Long_test.Minutes 60)
     ~executors:Long_test.[x86_executor1]
-    ~uses:[Tezt_wrapper.Uses.octez_experimental_agnostic_baker]
+    ~uses:[Tezt_wrapper.Uses.octez_agnostic_baker]
     (fun () ->
       let average_block_path =
         Cli.get ~default:None (fun s -> Some (Some s)) "average-block"
diff --git a/tezt/lib_tezos/agnostic_baker.ml b/tezt/lib_tezos/agnostic_baker.ml
index 8951de2bac10..5beb98bc110f 100644
--- a/tezt/lib_tezos/agnostic_baker.ml
+++ b/tezt/lib_tezos/agnostic_baker.ml
@@ -82,9 +82,8 @@ let liquidity_baking_votefile ?path vote =
       ]) ;
   votefile
 
-let create_from_uris ?runner
-    ?(path = Uses.path Constant.octez_experimental_agnostic_baker) ?name ?color
-    ?event_pipe ?(delegates = []) ?votefile
+let create_from_uris ?runner ?(path = Uses.path Constant.octez_agnostic_baker)
+    ?name ?color ?event_pipe ?(delegates = []) ?votefile
     ?(liquidity_baking_toggle_vote = Some Pass) ?force_apply_from_round
     ?(remote_mode = false) ?operations_pool ?dal_node_rpc_endpoint
     ?dal_node_timeout_percentage ?(state_recorder = false)
@@ -270,10 +269,9 @@ let wait_for_ready agnostic_baker =
         resolver :: agnostic_baker.persistent_state.pending_ready ;
       check_event agnostic_baker "agnostic baker started" promise
 
-let init ?env ?runner
-    ?(path = Uses.path Constant.octez_experimental_agnostic_baker) ?name ?color
-    ?event_level ?event_pipe ?event_sections_levels ?(delegates = []) ?votefile
-    ?liquidity_baking_toggle_vote ?force_apply_from_round ?remote_mode
+let init ?env ?runner ?(path = Uses.path Constant.octez_agnostic_baker) ?name
+    ?color ?event_level ?event_pipe ?event_sections_levels ?(delegates = [])
+    ?votefile ?liquidity_baking_toggle_vote ?force_apply_from_round ?remote_mode
     ?operations_pool ?dal_node ?dal_node_timeout_percentage ?state_recorder
     ?node_version_check_bypass ?node_version_allowed node client =
   let* () = Node.wait_for_ready node in
diff --git a/tezt/lib_tezos/constant.ml b/tezt/lib_tezos/constant.ml
index 33376eb36173..1e30587f05d9 100644
--- a/tezt/lib_tezos/constant.ml
+++ b/tezt/lib_tezos/constant.ml
@@ -162,11 +162,8 @@ module WASM = struct
     Uses.make ~tag:"tx_kernel_dal" ~path:"tx_kernel_dal.wasm" ()
 end
 
-let octez_experimental_agnostic_baker =
-  Uses.make
-    ~tag:"experimental_agnostic_baker"
-    ~path:"./octez-experimental-agnostic-baker"
-    ()
+let octez_agnostic_baker =
+  Uses.make ~tag:"agnostic_baker" ~path:"./octez-experimental-agnostic-baker" ()
 
 (* TODO: tezos/tezos#4803
    Can we do better than to depend on script-inputs?
diff --git a/tezt/lib_tezos/vdf.ml b/tezt/lib_tezos/vdf.ml
index abd02f93debb..5557fef82d82 100644
--- a/tezt/lib_tezos/vdf.ml
+++ b/tezt/lib_tezos/vdf.ml
@@ -67,7 +67,7 @@ let create ~protocol ?name ?color ?event_pipe ?runner node =
   let name = match name with None -> fresh_name () | Some name -> name in
   let vdf_baker =
     create
-      ~path:(Uses.path Constant.octez_experimental_agnostic_baker)
+      ~path:(Uses.path Constant.octez_agnostic_baker)
       ?name:(Some name)
       ?color
       ?event_pipe
diff --git a/tezt/long_tests/tenderbake.ml b/tezt/long_tests/tenderbake.ml
index ae991814dc6e..1b01a066646a 100644
--- a/tezt/long_tests/tenderbake.ml
+++ b/tezt/long_tests/tenderbake.ml
@@ -326,7 +326,7 @@ module Rounds = struct
       ~title:test
       ~tags:["tenderbake"; "basic"]
       ~team
-      ~uses:[Constant.octez_experimental_agnostic_baker]
+      ~uses:[Constant.octez_agnostic_baker]
       ~executors
       ~timeout:(Long_test.Seconds (repeat * 8 * timeout))
     @@ fun () ->
@@ -483,7 +483,7 @@ module Long_dynamic_bake = struct
       ~title:(test topology)
       ~tags:["tenderbake"; "dynamic"; string_of_topology topology]
       ~team
-      ~uses:[Constant.octez_experimental_agnostic_baker]
+      ~uses:[Constant.octez_agnostic_baker]
       ~executors
       ~timeout:(Long_test.Seconds (repeat * 8 * timeout))
     @@ fun () ->
diff --git a/tezt/manual_tests/baker_test.ml b/tezt/manual_tests/baker_test.ml
index af826c4abc04..e203a75ea5df 100644
--- a/tezt/manual_tests/baker_test.ml
+++ b/tezt/manual_tests/baker_test.ml
@@ -112,7 +112,7 @@ let baker_early_preattestation_test =
     ~__FILE__
     ~title:"Test baker early pre-attestation"
     ~tags:["node"; "agnostic_baker"; "early"; "preattestation"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
     ~supports:(Protocol.From_protocol 16)
   @@ fun protocol ->
   Log.info
diff --git a/tezt/manual_tests/dal.ml b/tezt/manual_tests/dal.ml
index 9579200c5dd8..5366d11b4aaa 100644
--- a/tezt/manual_tests/dal.ml
+++ b/tezt/manual_tests/dal.ml
@@ -457,7 +457,7 @@ let baker_test ~network =
     ~__FILE__
     ~title:(sf "Join %s and bake" network)
     ~tags:[Tag.tezos2; "dal"; "baker"; network]
-    ~uses:[Constant.octez_experimental_agnostic_baker]
+    ~uses:[Constant.octez_agnostic_baker]
   @@ fun () ->
   let baker_sk = Cli.get_string_opt "baker-sk" in
   let dal_bootstrap_peers =
diff --git a/tezt/tests/agnostic_baker_test.ml b/tezt/tests/agnostic_baker_test.ml
index b026e779a97d..90f38a68a140 100644
--- a/tezt/tests/agnostic_baker_test.ml
+++ b/tezt/tests/agnostic_baker_test.ml
@@ -150,7 +150,7 @@ let migrate ~migrate_from ~migrate_to ~use_remote_signer =
         Protocol.tag migrate_from;
         Protocol.tag migrate_to;
       ]
-    ~uses:([Constant.octez_experimental_agnostic_baker] @ remote_signer)
+    ~uses:([Constant.octez_agnostic_baker] @ remote_signer)
   @@ fun () ->
   let blocks_per_cycle = JSON.(get "blocks_per_cycle" parameters |> as_int) in
   let consensus_rights_delay =
@@ -183,7 +183,7 @@ let register_protocol_independent () =
     ~__FILE__
     ~title:"Agnostic baker starts and stops"
     ~tags:[team; "sandbox"; "agnostic"; "baker"; "init"]
-    ~uses:[Constant.octez_experimental_agnostic_baker]
+    ~uses:[Constant.octez_agnostic_baker]
   @@ fun () ->
   let* node, client = Client.init_with_node `Client () in
   let* baker = Agnostic_baker.init node client in
diff --git a/tezt/tests/baker_operations_cli_options.ml b/tezt/tests/baker_operations_cli_options.ml
index 23f725169c7f..f592aac7062c 100644
--- a/tezt/tests/baker_operations_cli_options.ml
+++ b/tezt/tests/baker_operations_cli_options.ml
@@ -338,7 +338,7 @@ let test_baker_external_operations =
     ~__FILE__
     ~title:"Baker external operations"
     ~tags:[Tag.layer1; "baker"; "external"; "operations"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Init" ;
   let node_args = Node.[Synchronisation_threshold 0] in
@@ -501,7 +501,7 @@ let test_baker_state_recorder_memory =
     ~__FILE__
     ~title:"Baker state recorder - memory case"
     ~tags:[Tag.layer1; "baker"; "state"; "recorder"; "memory"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol -> test_baker_state_recorder protocol false
 
 let test_baker_state_recorder_filesystem =
@@ -509,7 +509,7 @@ let test_baker_state_recorder_filesystem =
     ~__FILE__
     ~title:"Baker state recorder - filesystem case"
     ~tags:[Tag.layer1; "baker"; "state"; "recorder"; "filesystem"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol -> test_baker_state_recorder protocol true
 
 let register ~protocols =
diff --git a/tezt/tests/baker_test.ml b/tezt/tests/baker_test.ml
index 66c1655bd2d7..454145679020 100644
--- a/tezt/tests/baker_test.ml
+++ b/tezt/tests/baker_test.ml
@@ -61,7 +61,7 @@ let check_node_version_check_bypass_test =
     ~title:"baker node version check bypass test"
     ~tags:[team; "node"; "baker"]
     ~supports:Protocol.(From_protocol 021)
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* node, client = Client.init_with_protocol `Client ~protocol () in
   let baker =
@@ -81,7 +81,7 @@ let check_node_version_allowed_test =
     ~title:"baker node version allowed test"
     ~tags:[team; "node"; "baker"]
     ~supports:Protocol.(From_protocol 022)
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* node, client = Client.init_with_protocol `Client ~protocol () in
   let* _baker =
@@ -98,7 +98,7 @@ let check_node_version_no_commit_allowed_test =
     ~title:"baker node version no commit allowed test"
     ~tags:[team; "node"; "baker"]
     ~supports:Protocol.(From_protocol 022)
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* node, client = Client.init_with_protocol `Client ~protocol () in
   let* _baker =
@@ -111,7 +111,7 @@ let baker_reward_test =
     ~__FILE__
     ~title:"Baker rewards"
     ~tags:[team; "baker"; "rewards"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
     (fun protocol ->
       let* parameter_file =
         Protocol.write_parameter_file
@@ -168,7 +168,7 @@ let baker_simple_test =
     ~__FILE__
     ~title:"baker test"
     ~tags:[team; "node"; "baker"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* _ =
     baker_test protocol ~keys:(Account.Bootstrap.keys |> Array.to_list)
@@ -180,7 +180,7 @@ let baker_stresstest =
     ~__FILE__
     ~title:"baker stresstest"
     ~tags:[team; "node"; "baker"; "stresstest"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* node, client =
     Client.init_with_protocol `Client ~protocol () ~timestamp:Now
@@ -197,7 +197,7 @@ let baker_stresstest_apply =
     ~__FILE__
     ~title:"baker stresstest with forced application"
     ~tags:[team; "node"; "baker"; "stresstest"; "apply"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* node, client =
     Client.init_with_protocol `Client ~protocol () ~timestamp:Now
@@ -288,7 +288,7 @@ let baker_remote_test =
     ~__FILE__
     ~title:"Baker in RPC-only mode"
     ~tags:[team; "baker"; "remote"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* node, client =
     Client.init_with_protocol `Client ~protocol () ~timestamp:Now
@@ -302,7 +302,7 @@ let baker_check_consensus_branch =
     ~__FILE__
     ~title:"Baker check branch in consensus operations"
     ~tags:[team; "baker"; "grandparent"; "parent"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Init client and node with protocol %s" (Protocol.name protocol) ;
   let* node, client =
@@ -350,7 +350,7 @@ let force_apply_from_round =
     ~title:"Baker check force apply from round"
     ~tags:[team; "baker"; "force_apply_from_round"]
     ~supports:Protocol.(From_protocol 021)
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   log_step 1 "initialize a node and a client with protocol" ;
   let* node, client =
@@ -508,7 +508,7 @@ let simple_attestations_aggregation =
     ~title:"Simple attestations aggregation"
     ~tags:[team; "baker"; "attestation"; "aggregation"]
     ~supports:Protocol.(From_protocol 023)
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   log_step 1 "Initialize a node and a client with protocol" ;
   let consensus_rights_delay = 1 in
diff --git a/tezt/tests/cloud/dal.ml b/tezt/tests/cloud/dal.ml
index 813775f53221..04dd0c9bdf27 100644
--- a/tezt/tests/cloud/dal.ml
+++ b/tezt/tests/cloud/dal.ml
@@ -3588,7 +3588,7 @@ let register (module Cli : Scenarios_cli.Dal) =
            [
              "octez-dal-node";
              "octez-client";
-             Tezt_wrapper.Uses.path Constant.octez_experimental_agnostic_baker;
+             Tezt_wrapper.Uses.path Constant.octez_agnostic_baker;
            ]
            @ (if Cli.etherlink then
                 ["evm_kernel.wasm"; "octez-evm-node"; "octez-smart-rollup-node"]
diff --git a/tezt/tests/cloud/tezos.ml b/tezt/tests/cloud/tezos.ml
index 993374712348..f4197ed76cbe 100644
--- a/tezt/tests/cloud/tezos.ml
+++ b/tezt/tests/cloud/tezos.ml
@@ -449,8 +449,8 @@ module Agnostic_baker = struct
 
   module Agent = struct
     let init ?(group = "L1") ?env ?name ~delegates
-        ?(path = Uses.path Constant.octez_experimental_agnostic_baker) ~client
-        ?dal_node ?dal_node_timeout_percentage node cloud agent =
+        ?(path = Uses.path Constant.octez_agnostic_baker) ~client ?dal_node
+        ?dal_node_timeout_percentage node cloud agent =
       let* path = Agent.copy agent ~source:path in
       let* () =
         Cloud.register_binary
diff --git a/tezt/tests/dal.ml b/tezt/tests/dal.ml
index 7384a9f866dc..ef5178943872 100644
--- a/tezt/tests/dal.ml
+++ b/tezt/tests/dal.ml
@@ -3638,7 +3638,7 @@ let register_end_to_end_tests ~protocols =
         ~activation_timestamp:(Ago activation_timestamp)
         ~minimal_block_delay:(string_of_int block_delay)
         ~tags
-        ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+        ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
         title
         (e2e_test_script
            ~slot_index
@@ -4599,7 +4599,7 @@ let test_migration_accuser_issue ~migrate_from ~migrate_to =
     ~scenario
     ~tags
     ~description
-    ~uses:[Constant.octez_experimental_agnostic_baker]
+    ~uses:[Constant.octez_agnostic_baker]
     ~activation_timestamp:Now
     ~producer_profiles:[slot_index]
     ~minimal_block_delay:
@@ -7408,7 +7408,7 @@ let scenario_tutorial_dal_baker =
     ~__FILE__
     ~tags:[team; Tag.memory_3k; "tutorial"; "dal"; "baker"]
     ~uses:(fun _protocol ->
-      [Constant.octez_experimental_agnostic_baker; Constant.octez_dal_node])
+      [Constant.octez_agnostic_baker; Constant.octez_dal_node])
     (Printf.sprintf "%s" description)
     (fun protocol ->
       (* Note: Step 1 consists in setting up docker which we don't use
@@ -10218,7 +10218,7 @@ let register ~protocols =
     test_attester_with_bake_for
     protocols ;
   scenario_with_layer1_and_dal_nodes
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
     ~attestation_threshold:100
     ~attestation_lag:16
     ~activation_timestamp:Now
@@ -10274,7 +10274,7 @@ let register ~protocols =
     protocols ;
   scenario_with_layer1_and_dal_nodes
     "baker registers profiles with dal node"
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
     ~activation_timestamp:Now
     ~prover:false
     test_baker_registers_profiles
@@ -10393,7 +10393,7 @@ let register ~protocols =
     test_attesters_receive_dal_rewards
     (List.filter (fun p -> Protocol.number p >= 022) protocols) ;
   scenario_with_layer1_and_dal_nodes
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
     ~tags:["restart"]
     ~activation_timestamp:Now
     ~producer_profiles:[0]
@@ -10402,7 +10402,7 @@ let register ~protocols =
     test_restart_dal_node
     protocols ;
   scenario_with_layer1_and_dal_nodes
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
     ~tags:["restart"]
     ~activation_timestamp:Now
     ~bootstrap_profile:true
diff --git a/tezt/tests/http_cache_headers.ml b/tezt/tests/http_cache_headers.ml
index de816c1f0c1c..1052669e31da 100644
--- a/tezt/tests/http_cache_headers.ml
+++ b/tezt/tests/http_cache_headers.ml
@@ -117,7 +117,7 @@ let test_if_none_match ~rpc_external =
     ~title
     ~tags:["rpc"; "middleware"; "http_cache_headers"]
     ~supports:(From_protocol 19)
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Initialize client, node and baker" ;
   let* node, client =
diff --git a/tezt/tests/liquidity_baking_per_block_votes.ml b/tezt/tests/liquidity_baking_per_block_votes.ml
index b4b8e08edad5..7ea2e79a1671 100644
--- a/tezt/tests/liquidity_baking_per_block_votes.ml
+++ b/tezt/tests/liquidity_baking_per_block_votes.ml
@@ -112,7 +112,7 @@ let test_all_per_block_votes =
     ~tags:[team; "liquidity"; "baking"; "votes"]
     ~supports:
       (Protocol.Between_protocols (Protocol.number Alpha, Protocol.number Alpha))
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let ( >|= ) = Lwt.( >|= ) in
   let error_prefix = "baker." ^ Protocol.encoding_prefix protocol ^ "." in
diff --git a/tezt/tests/nonce_seed_revelation.ml b/tezt/tests/nonce_seed_revelation.ml
index 4c8f510ff064..35b179257a58 100644
--- a/tezt/tests/nonce_seed_revelation.ml
+++ b/tezt/tests/nonce_seed_revelation.ml
@@ -57,7 +57,7 @@ let test_nonce_seed_revelation =
     ~__FILE__
     ~title:"Nonce seed revelation"
     ~tags:[team; "nonce"; "seed"; "revelation"; Tag.memory_3k]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   (* Run a node and a baker.
      The node runs in archive mode to obtain metadata with [RPC.get_chain_block]. *)
@@ -235,7 +235,7 @@ let test_baking_nonce_migration =
     ~__FILE__
     ~title:"Baking nonce format migration"
     ~tags:[team; "nonce"; "migration"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Initialize node and client" ;
   let* node, client =
diff --git a/tezt/tests/protocol_migration.ml b/tezt/tests/protocol_migration.ml
index 7c8111827494..00a07244496e 100644
--- a/tezt/tests/protocol_migration.ml
+++ b/tezt/tests/protocol_migration.ml
@@ -551,7 +551,7 @@ let test_migration_with_bakers ?(migration_level = 4)
         "from_" ^ Protocol.tag migrate_from;
         "to_" ^ Protocol.tag migrate_to;
       ]
-    ~uses:[Constant.octez_experimental_agnostic_baker]
+    ~uses:[Constant.octez_agnostic_baker]
   @@ fun () ->
   let* client, node =
     user_migratable_node_init ~migration_level ~migrate_to ()
@@ -652,7 +652,7 @@ let test_forked_migration_manual ?(migration_level = 4)
         "from_" ^ Protocol.tag migrate_from;
         "to_" ^ Protocol.tag migrate_to;
       ]
-    ~uses:[Constant.octez_experimental_agnostic_baker]
+    ~uses:[Constant.octez_agnostic_baker]
     ~title:
       (Printf.sprintf
          "manually forked migration blocks from %s to %s"
@@ -853,7 +853,7 @@ let test_forked_migration_bakers ~migrate_from ~migrate_to =
           "from_" ^ Protocol.tag migrate_from;
           "to_" ^ Protocol.tag migrate_to;
         ])
-    ~uses:[Constant.octez_experimental_agnostic_baker]
+    ~uses:[Constant.octez_agnostic_baker]
     ~title:
       (Printf.sprintf
          "agnostic baker forked migration blocks from %s to %s"
diff --git a/tezt/tests/signer_test.ml b/tezt/tests/signer_test.ml
index 315e401823ff..7a36dff174ed 100644
--- a/tezt/tests/signer_test.ml
+++ b/tezt/tests/signer_test.ml
@@ -75,7 +75,7 @@ let signer_simple_test =
     ~title:"signer test"
     ~tags:[team; "node"; "baker"; "tz1"]
     ~uses:(fun _protocol ->
-      [Constant.octez_signer; Constant.octez_experimental_agnostic_baker])
+      [Constant.octez_signer; Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let* _ =
     signer_test protocol ~keys:(Account.Bootstrap.keys |> Array.to_list)
diff --git a/tezt/tests/synchronisation_heuristic.ml b/tezt/tests/synchronisation_heuristic.ml
index 19a45beb9100..cf95bc406a69 100644
--- a/tezt/tests/synchronisation_heuristic.ml
+++ b/tezt/tests/synchronisation_heuristic.ml
@@ -232,7 +232,7 @@ let test_threshold_zero =
     ~title:"bootstrap: test threshold zero"
     ~tags:
       [team; Tag.flaky; "synchronisation_threshold"; "bootstrap"; "threshold"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Setup network" ;
   let* node, client =
@@ -269,7 +269,7 @@ let test_threshold_one =
     ~__FILE__
     ~title:"bootstrap: test threshold one"
     ~tags:[team; "bootstrap"; "threshold"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Add a first peer with threshold zero" ;
   let* node, client =
@@ -309,7 +309,7 @@ let test_threshold_two =
     ~title:"bootstrap: test threshold two"
     ~tags:
       [team; Tag.flaky; "synchronisation_threshold"; "bootstrap"; "threshold"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info "Add a first peer with threshold zero" ;
   let* node, client =
@@ -378,7 +378,7 @@ let test_threshold_stuck =
     ~title:"bootstrap: test threshold stuck"
     ~tags:
       [team; Tag.flaky; "synchronisation_threshold"; "bootstrap"; "threshold"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let sync_latency = 3 in
 
@@ -442,7 +442,7 @@ let test_threshold_split_view =
     ~title:"bootstrap: test threshold split view"
     ~tags:
       [team; Tag.flaky; "synchronisation_threshold"; "bootstrap"; "threshold"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   Log.info
     "Add two peers with threshold zero, and one with threshold 2 and a high \
@@ -517,7 +517,7 @@ let test_many_nodes_bootstrap =
         "threshold";
         Tag.memory_4k;
       ]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let num_nodes = 8 in
   let running_time = 10.0 in
diff --git a/tezt/tests/vdf_test.ml b/tezt/tests/vdf_test.ml
index 65acbd7069b5..ff785822f27b 100644
--- a/tezt/tests/vdf_test.ml
+++ b/tezt/tests/vdf_test.ml
@@ -243,7 +243,7 @@ let vdf_cycles : Protocol.t list -> unit =
     ~__FILE__
     ~title:"VDF daemon"
     ~tags:[team; "vdf"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   let n_cycles = 2 in
   let* node, client, blocks_per_cycle, nonce_revelation_threshold =
@@ -343,7 +343,7 @@ let vdf_cancel : Protocol.t list -> unit =
     ~__FILE__
     ~title:"Cancelling VDF computation"
     ~tags:[team; "vdf"]
-    ~uses:(fun _protocol -> [Constant.octez_experimental_agnostic_baker])
+    ~uses:(fun _protocol -> [Constant.octez_agnostic_baker])
   @@ fun protocol ->
   (* Override the `vdf_difficulty` constant in order ensure that
    * a VDF computation started in the last block of a cycle will not be finished
diff --git a/tezt/tests/voting.ml b/tezt/tests/voting.ml
index 312e3a09bdfb..bb683ae9e120 100644
--- a/tezt/tests/voting.ml
+++ b/tezt/tests/voting.ml
@@ -890,8 +890,7 @@ let test_user_activated_protocol_override_baker_vote ~from_protocol ~to_protocol
         "from_" ^ Protocol.tag from_protocol;
         "to_" ^ Protocol.tag to_protocol;
       ]
-    ~uses:
-      [Protocol.accuser to_protocol; Constant.octez_experimental_agnostic_baker]
+    ~uses:[Protocol.accuser to_protocol; Constant.octez_agnostic_baker]
   @@ fun () ->
   let node_arguments = [Node.Synchronisation_threshold 0] in
   let to_protocol_hash = Protocol.hash to_protocol in
-- 
GitLab


From 56e41793747817b249496c03302aa9a0a74c22e2 Mon Sep 17 00:00:00 2001
From: Gabriel Moise <gabriel.moise@trili.tech>
Date: Mon, 31 Mar 2025 11:57:37 +0100
Subject: [PATCH 2/5] Agnostic_baker: Remove experimental term

---
 .dockerignore                                    |  2 +-
 .gitignore                                       |  2 +-
 .gitlab/ci/pipelines/schedule_extended_test.yml  |  4 ++--
 dune-project                                     |  4 ++--
 manifest/product_octez.ml                        | 16 ++++++++--------
 ...er-lib.opam => octez-agnostic-baker-lib.opam} |  0
 ...stic-baker.opam => octez-agnostic-baker.opam} |  4 ++--
 opam/octez-protocol-021-PsQuebec-libs.opam       |  2 +-
 opam/octez-protocol-022-PsRiotum-libs.opam       |  2 +-
 opam/octez-protocol-alpha-libs.opam              |  2 +-
 script-inputs/ci-opam-package-tests              |  4 ++--
 script-inputs/octez-released-executables         |  2 +-
 script-inputs/released-executables               |  2 +-
 src/bin_agnostic_baker/dune                      |  8 ++++----
 src/lib_agnostic_baker/agnostic_baker_events.ml  |  2 +-
 src/lib_agnostic_baker/dune                      |  4 ++--
 src/lib_agnostic_baker/parameters.ml             |  2 +-
 src/proto_021_PsQuebec/lib_agnostic_baker/dune   |  4 ++--
 src/proto_022_PsRiotum/lib_agnostic_baker/dune   |  4 ++--
 src/proto_alpha/lib_agnostic_baker/dune          |  4 ++--
 tezt/lib_cloud/dockerfiles/dal.Dockerfile        |  2 +-
 tezt/lib_tezos/agnostic_baker.mli                |  2 +-
 tezt/lib_tezos/constant.ml                       |  2 +-
 .../tezt_wrapper.ml/runtime-dependency-tags.out  |  2 +-
 tezt/lib_wrapper/tezt_wrapper.ml                 |  4 ++--
 tezt/lib_wrapper/tezt_wrapper.mli                |  4 ++--
 tezt/tests/agnostic_baker_test.ml                |  2 +-
 tobi/config                                      |  4 ++--
 28 files changed, 48 insertions(+), 48 deletions(-)
 rename opam/{octez-experimental-agnostic-baker-lib.opam => octez-agnostic-baker-lib.opam} (100%)
 rename opam/{octez-experimental-agnostic-baker.opam => octez-agnostic-baker.opam} (87%)

diff --git a/.dockerignore b/.dockerignore
index 0e01ce0ad9ac..af9fb435684b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -39,7 +39,7 @@ octez-injector-server
 octogram
 octez-teztale-archiver
 octez-teztale-server
-octez-experimental-agnostic-baker
+octez-agnostic-baker
 
 scripts/opam-test-all.sh.DONE
 scripts/create_genesis/src
diff --git a/.gitignore b/.gitignore
index 9d13bd2eff4b..7ad570084c9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ __pycache__
 /safety-checker
 /octez-teztale-archiver
 /octez-teztale-server
-/octez-experimental-agnostic-baker
+/octez-agnostic-baker
 /octez-teztale-snitch
 
 /src/riscv/riscv-sandbox*
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index de93e4cf50af..0f6661f0353b 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -1328,7 +1328,7 @@ opam:all_2:
       - octez-protocol-001-PtCJ7pwo-libs
       - octez-protocol-000-Ps9mPmXa-libs
       - octez-injector
-      - octez-experimental-agnostic-baker-lib
+      - octez-agnostic-baker-lib
 
 opam:all_1:
   image: ${ci_image_name}/prebuild:${ci_image_tag}
@@ -1639,12 +1639,12 @@ opam:exec_1:
       - octez-smart-rollup-wasm-debugger
       - octez-smart-rollup-node
       - octez-node
-      - octez-experimental-agnostic-baker
       - octez-dal-node
       - octez-codec
       - octez-client
       - octez-baker-PsRiotum
       - octez-baker-PsQuebec
+      - octez-agnostic-baker
       - octez-accuser-PsRiotum
       - octez-accuser-PsQuebec
 
diff --git a/dune-project b/dune-project
index fe1bf7907551..96ec76fe0004 100644
--- a/dune-project
+++ b/dune-project
@@ -18,6 +18,8 @@
 (package (name octez-accuser-PsQuebec))
 (package (name octez-accuser-PsRiotum))
 (package (name octez-accuser-alpha))
+(package (name octez-agnostic-baker))
+(package (name octez-agnostic-baker-lib))
 (package (name octez-alcotezt))
 (package (name octez-baker-PsQuebec))
 (package (name octez-baker-PsRiotum))
@@ -33,8 +35,6 @@
 (package (name octez-evm-node-libs))
 (package (name octez-evm-node-tests)(allow_empty))
 (package (name octez-evm-wasm-runtime-tests)(allow_empty))
-(package (name octez-experimental-agnostic-baker))
-(package (name octez-experimental-agnostic-baker-lib))
 (package (name octez-injector))
 (package (name octez-injector-server))
 (package (name octez-internal-libs))
diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml
index 5f3eb0d04b81..f2e2634dae36 100644
--- a/manifest/product_octez.ml
+++ b/manifest/product_octez.ml
@@ -5641,12 +5641,12 @@ let _octez_scoru_wasm_fast_tests =
       ]
     ~preprocess:(staged_pps [ppx_import; ppx_deriving_show])
 
-let octez_experimental_agnostic_baker_lib =
+let octez_agnostic_baker_lib =
   let (PPX {preprocess; preprocessor_deps}) = ppx_profiler in
   public_lib
-    "octez-experimental-agnostic-baker-lib"
+    "octez-agnostic-baker-lib"
     ~path:"src/lib_agnostic_baker"
-    ~internal_name:"octez_experimental_agnostic_baker"
+    ~internal_name:"octez_agnostic_baker"
     ~synopsis:"Octez: library for Agnostic Baker"
     ~preprocess
     ~preprocessor_deps
@@ -7513,7 +7513,7 @@ let hash = Protocol.hash
             main |> open_;
             baking |> if_some |> open_;
             baking_commands |> if_some |> open_;
-            octez_experimental_agnostic_baker_lib |> open_;
+            octez_agnostic_baker_lib |> open_;
           ]
         ~linkall:true
     in
@@ -8587,7 +8587,7 @@ let _octez_node =
             ~section:"bin";
         ]
 
-let _octez_experimental_agnostic_baker =
+let _octez_agnostic_baker =
   let (PPX {preprocess; preprocessor_deps}) = ppx_profiler in
   let protocol_deps =
     let deps_for_protocol protocol =
@@ -8602,10 +8602,10 @@ let _octez_experimental_agnostic_baker =
     List.map deps_for_protocol Protocol.all |> List.flatten
   in
   public_exe
-    "octez-experimental-agnostic-baker"
+    "octez-agnostic-baker"
     ~path:"src/bin_agnostic_baker"
     ~internal_name:"main_agnostic_baker"
-    ~synopsis:"Tezos: `octez-experimental-agnostic-baker` binary for baking"
+    ~synopsis:"Tezos: `octez-agnostic-baker` binary for baking"
     ~preprocess
     ~preprocessor_deps
     ~release_status:Released
@@ -8617,7 +8617,7 @@ let _octez_experimental_agnostic_baker =
          octez_base |> open_ ~m:"TzPervasives" |> open_;
          octez_base_unix |> open_;
          octez_client_base_unix |> open_;
-         octez_experimental_agnostic_baker_lib |> open_;
+         octez_agnostic_baker_lib |> open_;
          octez_profiler |> open_;
        ]
       @ protocol_deps)
diff --git a/opam/octez-experimental-agnostic-baker-lib.opam b/opam/octez-agnostic-baker-lib.opam
similarity index 100%
rename from opam/octez-experimental-agnostic-baker-lib.opam
rename to opam/octez-agnostic-baker-lib.opam
diff --git a/opam/octez-experimental-agnostic-baker.opam b/opam/octez-agnostic-baker.opam
similarity index 87%
rename from opam/octez-experimental-agnostic-baker.opam
rename to opam/octez-agnostic-baker.opam
index 8924250713f5..47f4df04f570 100644
--- a/opam/octez-experimental-agnostic-baker.opam
+++ b/opam/octez-agnostic-baker.opam
@@ -14,7 +14,7 @@ depends: [
   "octez-rust-deps" { = version }
   "bls12-381" { = version }
   "octez-shell-libs" { = version }
-  "octez-experimental-agnostic-baker-lib" { = version }
+  "octez-agnostic-baker-lib" { = version }
   "octez-protocol-021-PsQuebec-libs" { = version }
   "octez-protocol-022-PsRiotum-libs" { = version }
 ]
@@ -30,4 +30,4 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 available: os-family != "windows"
-synopsis: "Tezos: `octez-experimental-agnostic-baker` binary for baking"
+synopsis: "Tezos: `octez-agnostic-baker` binary for baking"
diff --git a/opam/octez-protocol-021-PsQuebec-libs.opam b/opam/octez-protocol-021-PsQuebec-libs.opam
index 75dbe05ce0ce..e8f509484fde 100644
--- a/opam/octez-protocol-021-PsQuebec-libs.opam
+++ b/opam/octez-protocol-021-PsQuebec-libs.opam
@@ -29,7 +29,7 @@ depends: [
   "memtrace"
   "octez-protocol-compiler" { = version }
   "tezos-dal-node-lib" { = version }
-  "octez-experimental-agnostic-baker-lib" { = version }
+  "octez-agnostic-baker-lib" { = version }
   "octez-injector" { = version }
   "octez-l2-libs" { = version }
   "octez-rustzcash-deps" { with-test & = version }
diff --git a/opam/octez-protocol-022-PsRiotum-libs.opam b/opam/octez-protocol-022-PsRiotum-libs.opam
index e12636f45443..bbf2d8a03da7 100644
--- a/opam/octez-protocol-022-PsRiotum-libs.opam
+++ b/opam/octez-protocol-022-PsRiotum-libs.opam
@@ -29,7 +29,7 @@ depends: [
   "memtrace"
   "octez-protocol-compiler" { = version }
   "tezos-dal-node-lib" { = version }
-  "octez-experimental-agnostic-baker-lib" { = version }
+  "octez-agnostic-baker-lib" { = version }
   "octez-injector" { = version }
   "octez-l2-libs" { = version }
   "octez-rustzcash-deps" { with-test & = version }
diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam
index e12f3edf4955..26cc26cf40ec 100644
--- a/opam/octez-protocol-alpha-libs.opam
+++ b/opam/octez-protocol-alpha-libs.opam
@@ -29,7 +29,7 @@ depends: [
   "memtrace"
   "octez-protocol-compiler" { = version }
   "tezos-dal-node-lib" { = version }
-  "octez-experimental-agnostic-baker-lib" { = version }
+  "octez-agnostic-baker-lib" { = version }
   "octez-injector" { = version }
   "octez-l2-libs" { = version }
   "octez-alcotezt" { with-test & = version }
diff --git a/script-inputs/ci-opam-package-tests b/script-inputs/ci-opam-package-tests
index 3518bd39e406..82c6e6d29890 100644
--- a/script-inputs/ci-opam-package-tests
+++ b/script-inputs/ci-opam-package-tests
@@ -3,6 +3,8 @@ dal_node_migrations	all	6
 efunc_core	all	6
 octez-accuser-PsQuebec	exec	1
 octez-accuser-PsRiotum	exec	1
+octez-agnostic-baker	exec	1
+octez-agnostic-baker-lib	all	2
 octez-alcotezt	all	7
 octez-baker-PsQuebec	exec	1
 octez-baker-PsRiotum	exec	1
@@ -12,8 +14,6 @@ octez-crawler	all	4
 octez-dal-node	exec	1
 octez-distributed-internal	all	7
 octez-distributed-lwt-internal	all	7
-octez-experimental-agnostic-baker	exec	1
-octez-experimental-agnostic-baker-lib	all	2
 octez-injector	all	2
 octez-internal-libs	all	7
 octez-l2-libs	all	6
diff --git a/script-inputs/octez-released-executables b/script-inputs/octez-released-executables
index b8e8fe93fd08..d13fa93a0bea 100644
--- a/script-inputs/octez-released-executables
+++ b/script-inputs/octez-released-executables
@@ -5,7 +5,7 @@ octez-signer
 octez-codec
 octez-client
 octez-admin-client
-octez-experimental-agnostic-baker
+octez-agnostic-baker
 octez-node
 octez-accuser-PsRiotum
 octez-baker-PsRiotum
diff --git a/script-inputs/released-executables b/script-inputs/released-executables
index b8e8fe93fd08..d13fa93a0bea 100644
--- a/script-inputs/released-executables
+++ b/script-inputs/released-executables
@@ -5,7 +5,7 @@ octez-signer
 octez-codec
 octez-client
 octez-admin-client
-octez-experimental-agnostic-baker
+octez-agnostic-baker
 octez-node
 octez-accuser-PsRiotum
 octez-baker-PsRiotum
diff --git a/src/bin_agnostic_baker/dune b/src/bin_agnostic_baker/dune
index 73b805b34530..1add15ba0aa5 100644
--- a/src/bin_agnostic_baker/dune
+++ b/src/bin_agnostic_baker/dune
@@ -3,8 +3,8 @@
 
 (executable
  (name main_agnostic_baker)
- (public_name octez-experimental-agnostic-baker)
- (package octez-experimental-agnostic-baker)
+ (public_name octez-agnostic-baker)
+ (package octez-agnostic-baker)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-rust-deps
@@ -12,7 +12,7 @@
   octez-libs.base
   octez-libs.base.unix
   octez-shell-libs.client-base-unix
-  octez-experimental-agnostic-baker-lib
+  octez-agnostic-baker-lib
   octez-libs.octez-profiler
   octez-protocol-021-PsQuebec-libs.agnostic-baker
   octez-protocol-022-PsRiotum-libs.agnostic-baker
@@ -32,7 +32,7 @@
   -open Tezos_base
   -open Tezos_base_unix
   -open Tezos_client_base_unix
-  -open Octez_experimental_agnostic_baker
+  -open Octez_agnostic_baker
   -open Tezos_profiler))
 
 (rule
diff --git a/src/lib_agnostic_baker/agnostic_baker_events.ml b/src/lib_agnostic_baker/agnostic_baker_events.ml
index 2440c018b055..e7ffab0ca569 100644
--- a/src/lib_agnostic_baker/agnostic_baker_events.ml
+++ b/src/lib_agnostic_baker/agnostic_baker_events.ml
@@ -47,7 +47,7 @@ let starting_daemon =
     ~alternative_color
     ~level:Notice
     ~name:"starting_daemon"
-    ~msg:"experimental agnostic baker started"
+    ~msg:"agnostic baker started"
     ()
 
 let stopping_daemon =
diff --git a/src/lib_agnostic_baker/dune b/src/lib_agnostic_baker/dune
index 266070c8d71e..3ce85997056c 100644
--- a/src/lib_agnostic_baker/dune
+++ b/src/lib_agnostic_baker/dune
@@ -2,8 +2,8 @@
 ; Edit file manifest/main.ml instead.
 
 (library
- (name octez_experimental_agnostic_baker)
- (public_name octez-experimental-agnostic-baker-lib)
+ (name octez_agnostic_baker)
+ (public_name octez-agnostic-baker-lib)
  (instrumentation (backend bisect_ppx))
  (libraries
   octez-rustzcash-deps
diff --git a/src/lib_agnostic_baker/parameters.ml b/src/lib_agnostic_baker/parameters.ml
index 3dafdfffd569..19f0af57c506 100644
--- a/src/lib_agnostic_baker/parameters.ml
+++ b/src/lib_agnostic_baker/parameters.ml
@@ -13,7 +13,7 @@ let default_node_endpoint =
     "http://localhost:%d"
     Octez_node_config.Config_file.default_rpc_port
 
-let default_daily_logs_path = Some "octez-experimental-agnostic-baker"
+let default_daily_logs_path = Some "octez-agnostic-baker"
 
 let extra_levels_for_old_baker = 3
 
diff --git a/src/proto_021_PsQuebec/lib_agnostic_baker/dune b/src/proto_021_PsQuebec/lib_agnostic_baker/dune
index d12bd39185a2..f6c409967447 100644
--- a/src/proto_021_PsQuebec/lib_agnostic_baker/dune
+++ b/src/proto_021_PsQuebec/lib_agnostic_baker/dune
@@ -11,7 +11,7 @@
   tezos-protocol-021-PsQuebec.protocol
   octez-protocol-021-PsQuebec-libs.baking
   octez-protocol-021-PsQuebec-libs.baking-commands
-  octez-experimental-agnostic-baker-lib)
+  octez-agnostic-baker-lib)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -20,4 +20,4 @@
   -open Tezos_protocol_021_PsQuebec
   -open Tezos_baking_021_PsQuebec
   -open Tezos_baking_021_PsQuebec_commands
-  -open Octez_experimental_agnostic_baker))
+  -open Octez_agnostic_baker))
diff --git a/src/proto_022_PsRiotum/lib_agnostic_baker/dune b/src/proto_022_PsRiotum/lib_agnostic_baker/dune
index 1b6322dfa982..b3a7b990f35e 100644
--- a/src/proto_022_PsRiotum/lib_agnostic_baker/dune
+++ b/src/proto_022_PsRiotum/lib_agnostic_baker/dune
@@ -11,7 +11,7 @@
   tezos-protocol-022-PsRiotum.protocol
   octez-protocol-022-PsRiotum-libs.baking
   octez-protocol-022-PsRiotum-libs.baking-commands
-  octez-experimental-agnostic-baker-lib)
+  octez-agnostic-baker-lib)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -20,4 +20,4 @@
   -open Tezos_protocol_022_PsRiotum
   -open Tezos_baking_022_PsRiotum
   -open Tezos_baking_022_PsRiotum_commands
-  -open Octez_experimental_agnostic_baker))
+  -open Octez_agnostic_baker))
diff --git a/src/proto_alpha/lib_agnostic_baker/dune b/src/proto_alpha/lib_agnostic_baker/dune
index 592b925cf929..c7e8e448313e 100644
--- a/src/proto_alpha/lib_agnostic_baker/dune
+++ b/src/proto_alpha/lib_agnostic_baker/dune
@@ -11,7 +11,7 @@
   tezos-protocol-alpha.protocol
   octez-protocol-alpha-libs.baking
   octez-protocol-alpha-libs.baking-commands
-  octez-experimental-agnostic-baker-lib)
+  octez-agnostic-baker-lib)
  (library_flags (:standard -linkall))
  (flags
   (:standard)
@@ -20,4 +20,4 @@
   -open Tezos_protocol_alpha
   -open Tezos_baking_alpha
   -open Tezos_baking_alpha_commands
-  -open Octez_experimental_agnostic_baker))
+  -open Octez_agnostic_baker))
diff --git a/tezt/lib_cloud/dockerfiles/dal.Dockerfile b/tezt/lib_cloud/dockerfiles/dal.Dockerfile
index 9a0bf299dae9..e097e50a1f23 100644
--- a/tezt/lib_cloud/dockerfiles/dal.Dockerfile
+++ b/tezt/lib_cloud/dockerfiles/dal.Dockerfile
@@ -64,7 +64,7 @@ ARG BINARIES_DESTINATION_PATH
 COPY ./octez-node $BINARIES_DESTINATION_PATH/octez-node
 COPY ./octez-dal-node $BINARIES_DESTINATION_PATH/octez-dal-node
 COPY ./octez-client $BINARIES_DESTINATION_PATH/octez-client
-COPY ./octez-experimental-agnostic-baker $BINARIES_DESTINATION_PATH/octez-experimental-agnostic-baker
+COPY ./octez-agnostic-baker $BINARIES_DESTINATION_PATH/octez-agnostic-baker
 COPY ./octez-smart-rollup-node $BINARIES_DESTINATION_PATH/octez-smart-rollup-node
 COPY ./smart-rollup-installer $BINARIES_DESTINATION_PATH/smart-rollup-installer
 COPY ./octez-evm-node  $BINARIES_DESTINATION_PATH/octez-evm-node
diff --git a/tezt/lib_tezos/agnostic_baker.mli b/tezt/lib_tezos/agnostic_baker.mli
index 62c00048f060..64d9ff474a55 100644
--- a/tezt/lib_tezos/agnostic_baker.mli
+++ b/tezt/lib_tezos/agnostic_baker.mli
@@ -44,7 +44,7 @@ type event = {name : string; value : JSON.t; timestamp : float}
 (** See [Daemon.Make.on_event]. *)
 val on_event : t -> (event -> unit) -> unit
 
-(** Spawn [octez-experimental-agnostic-baker run].
+(** Spawn [octez-agnostic-baker run].
 
     The resulting promise is fulfilled as soon as the agnostic baker has been
     spawned. It continues running in the background. *)
diff --git a/tezt/lib_tezos/constant.ml b/tezt/lib_tezos/constant.ml
index 1e30587f05d9..749b86a375ec 100644
--- a/tezt/lib_tezos/constant.ml
+++ b/tezt/lib_tezos/constant.ml
@@ -163,7 +163,7 @@ module WASM = struct
 end
 
 let octez_agnostic_baker =
-  Uses.make ~tag:"agnostic_baker" ~path:"./octez-experimental-agnostic-baker" ()
+  Uses.make ~tag:"agnostic_baker" ~path:"./octez-agnostic-baker" ()
 
 (* TODO: tezos/tezos#4803
    Can we do better than to depend on script-inputs?
diff --git a/tezt/lib_wrapper/expected/tezt_wrapper.ml/runtime-dependency-tags.out b/tezt/lib_wrapper/expected/tezt_wrapper.ml/runtime-dependency-tags.out
index 425ab2fbd8d0..c9fe5629afc9 100644
--- a/tezt/lib_wrapper/expected/tezt_wrapper.ml/runtime-dependency-tags.out
+++ b/tezt/lib_wrapper/expected/tezt_wrapper.ml/runtime-dependency-tags.out
@@ -11,6 +11,7 @@ accuser_psquebec: octez-accuser-PsQuebec
 accuser_psriotum: octez-accuser-PsRiotum
 accuser_alpha: octez-accuser-alpha
 admin_client: octez-admin-client
+agnostic_baker: octez-agnostic-baker
 baker_psquebec: octez-baker-PsQuebec
 baker_psriotum: octez-baker-PsRiotum
 baker_alpha: octez-baker-alpha
@@ -21,7 +22,6 @@ dac_node: octez-dac-node
 dal_node: octez-dal-node
 dsn_node: octez-dsn-node
 evm_node: octez-evm-node
-agnostic_baker: octez-experimental-agnostic-baker
 node: octez-node
 protocol_compiler: octez-protocol-compiler
 signer: octez-signer
diff --git a/tezt/lib_wrapper/tezt_wrapper.ml b/tezt/lib_wrapper/tezt_wrapper.ml
index 4a987cd22966..5d71d3a89d93 100644
--- a/tezt/lib_wrapper/tezt_wrapper.ml
+++ b/tezt/lib_wrapper/tezt_wrapper.ml
@@ -57,8 +57,8 @@ module Uses = struct
   let octez_admin_client =
     make ~tag:"admin_client" ~path:"./octez-admin-client" ()
 
-  let octez_experimental_agnostic_baker =
-    make ~tag:"agnostic_baker" ~path:"./octez-experimental-agnostic-baker" ()
+  let octez_agnostic_baker =
+    make ~tag:"agnostic_baker" ~path:"./octez-agnostic-baker" ()
 
   let register_meta_test () =
     Regression.register
diff --git a/tezt/lib_wrapper/tezt_wrapper.mli b/tezt/lib_wrapper/tezt_wrapper.mli
index e66d26153403..266191427340 100644
--- a/tezt/lib_wrapper/tezt_wrapper.mli
+++ b/tezt/lib_wrapper/tezt_wrapper.mli
@@ -81,8 +81,8 @@ module Uses : sig
   (** ["./octez-admin-client"], with tag ["admin_client"]. *)
   val octez_admin_client : t
 
-  (** ["./octez-experimental-agnostic-baker"], with tag ["agnostic_baker"]. *)
-  val octez_experimental_agnostic_baker : t
+  (** ["./octez-agnostic-baker"], with tag ["agnostic_baker"]. *)
+  val octez_agnostic_baker : t
 
   (** Register a test that generates:
       {[
diff --git a/tezt/tests/agnostic_baker_test.ml b/tezt/tests/agnostic_baker_test.ml
index 90f38a68a140..0d7504b66358 100644
--- a/tezt/tests/agnostic_baker_test.ml
+++ b/tezt/tests/agnostic_baker_test.ml
@@ -7,7 +7,7 @@
 
 (* Testing
    -------
-   Component:    Agnostic baker (octez-experimental-agnostic-baker)
+   Component:    Agnostic baker (octez-agnostic-baker)
    Invocation:   dune exec tezt/tests/main.exe -- --file agnostic_baker_test.ml
    Subject:      Ensure that the agnostic baker behaves as expected
 
diff --git a/tobi/config b/tobi/config
index ae8b574c311c..4eba0c5bbb30 100644
--- a/tobi/config
+++ b/tobi/config
@@ -49,6 +49,8 @@ kaitai-of-data-encoding: client-libs/lib_kaitai_of_data_encoding, client-libs/li
 octez-accuser-PsQuebec: src/proto_021_PsQuebec/bin_accuser
 octez-accuser-PsRiotum: src/proto_022_PsRiotum/bin_accuser
 octez-accuser-alpha: src/proto_alpha/bin_accuser
+octez-agnostic-baker: src/bin_agnostic_baker
+octez-agnostic-baker-lib: src/lib_agnostic_baker
 octez-alcotezt: tezt/lib_alcotezt
 octez-baker-PsQuebec: src/proto_021_PsQuebec/bin_baker
 octez-baker-PsRiotum: src/proto_022_PsRiotum/bin_baker
@@ -64,8 +66,6 @@ octez-evm-node: etherlink/bin_node
 octez-evm-node-libs: etherlink/bin_node/config, etherlink/bin_node/installers, etherlink/bin_node/lib_dev, etherlink/bin_node/lib_dev/client, etherlink/bin_node/lib_dev/encodings, etherlink/bin_node/migrations, etherlink/lib_wasm_runtime, etherlink/lib_wasm_runtime/ocaml-api, etherlink/lib_wasm_runtime_callbacks, websocket/core, websocket/lwt
 octez-evm-node-tests: etherlink/bin_node/test
 octez-evm-wasm-runtime-tests: etherlink/lib_wasm_runtime_callbacks/test
-octez-experimental-agnostic-baker: src/bin_agnostic_baker
-octez-experimental-agnostic-baker-lib: src/lib_agnostic_baker
 octez-injector: src/lib_injector
 octez-injector-server: contrib/octez_injector_server
 octez-internal-libs: irmin/lib_irmin, irmin/lib_irmin/data, irmin/lib_irmin/mem, irmin/lib_irmin_pack, irmin/lib_irmin_pack/mem, irmin/lib_irmin_pack/unix, irmin/lib_irmin_tezos, irmin/lib_ppx_irmin, irmin/lib_ppx_irmin/internal, irmin/test/helpers
-- 
GitLab


From 41127d684d5c535a9505cf7c78951568a9ead918 Mon Sep 17 00:00:00 2001
From: Gabriel Moise <gabriel.moise@trili.tech>
Date: Mon, 31 Mar 2025 12:07:59 +0100
Subject: [PATCH 3/5] Agnostic_baker: Remove experimental warning

---
 src/lib_agnostic_baker/agnostic_baker_events.ml | 13 -------------
 src/lib_agnostic_baker/daemon.ml                |  1 -
 2 files changed, 14 deletions(-)

diff --git a/src/lib_agnostic_baker/agnostic_baker_events.ml b/src/lib_agnostic_baker/agnostic_baker_events.ml
index e7ffab0ca569..4b55a56912a8 100644
--- a/src/lib_agnostic_baker/agnostic_baker_events.ml
+++ b/src/lib_agnostic_baker/agnostic_baker_events.ml
@@ -102,16 +102,3 @@ let period_status =
     ("block", Block_hash.encoding)
     ("period", string)
     ("remaining", int31)
-
-(* Warning *)
-let experimental_binary =
-  declare_0
-    ~section
-    ~alternative_color
-    ~level:Warning
-    ~name:"experimental_binary"
-    ~msg:
-      "[WARNING] As the name suggests, this binary is EXPERIMENTAL, therefore \
-       it is intended for testing purposes only. Please do not use it on \
-       `mainnet`."
-    ()
diff --git a/src/lib_agnostic_baker/daemon.ml b/src/lib_agnostic_baker/daemon.ml
index 0e0a6232660e..b1ce04fec974 100644
--- a/src/lib_agnostic_baker/daemon.ml
+++ b/src/lib_agnostic_baker/daemon.ml
@@ -237,7 +237,6 @@ let baker_thread ~state =
     waits for a head with an [active] protocol. *)
 let may_start_initial_baker state =
   let open Lwt_result_syntax in
-  let*! () = Events.(emit experimental_binary) () in
   let rec may_start ?last_known_proto ~head_stream () =
     let* protocol_hash =
       Rpc_services.get_next_protocol_hash ~node_addr:state.node_endpoint
-- 
GitLab


From 0972f85e164f633f31892bb461557f5d8f2f3fe9 Mon Sep 17 00:00:00 2001
From: Gabriel Moise <gabriel.moise@trili.tech>
Date: Mon, 31 Mar 2025 12:08:16 +0100
Subject: [PATCH 4/5] Agnostic_baker: Update documentation and changelog

---
 CHANGES.rst                      |  2 ++
 docs/CHANGES.rst                 |  5 ++---
 src/bin_agnostic_baker/README.md | 10 ++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3f9071f66168..abe883d815cc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -72,6 +72,8 @@ Baker
 Agnostic Baker
 --------------
 
+- The agnostic baker binary becomes ``octez-agnostic-baker``. (MR :gl:`!17491`)
+
 - The agnostic baker now has the same CLI as the classical baker, getting rid of the
   ``--`` separator. (MR :gl:`!17348`)
 
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 5e3b203b7fd3..149253c84c01 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -155,6 +155,8 @@ Smart Rollup node
 Agnostic Baker
 --------------
 
+- The agnostic baker binary becomes ``octez-agnostic-baker``. (MR :gl:`!17491`)
+
 - Released agnostic baker binary as experimental. (MR :gl:`!16318`)
 
 - Use of a generic watchdog. (MR :gl:`!15508`)
@@ -170,9 +172,6 @@ and executes the appropriate baking binary based on the active protocol. It cont
 monitors the blockchain state and automatically transitions to the correct binary whenever
 a new protocol is detected, such as during migrations or at startup.
 
-Please note that this feature is in an EXPERIMENTAL phase, as clearly suggested by its name.
-Therefore, it should NOT be used on ``mainnet``. For further clarifications, you can consult
-the README from ``src/bin_agnostic_baker``.
 
 Protocol Compiler And Environment
 ---------------------------------
diff --git a/src/bin_agnostic_baker/README.md b/src/bin_agnostic_baker/README.md
index e279baf115f9..65bc65c57b94 100644
--- a/src/bin_agnostic_baker/README.md
+++ b/src/bin_agnostic_baker/README.md
@@ -1,4 +1,4 @@
-# Agnostic Baker (experimental)
+# Agnostic Baker
 
 ## Overview
 
@@ -11,19 +11,13 @@ It is designed to simplify the baking process for users, such that they will no
 longer need to run two baker binaries at migration time. This makes the need for
 protocol specific baking binaries obsolete.
 
-## Experimental purpose
-
-For now, the binary is continuously being developed and tested. This is the reason
-why users are warned that the binary is experimental and that it should not be
-used for real-life scenarios, for instance, baking on `mainnet`.
-
 ## Usage
 
 To run the agnostic baker, the command line syntax is similar to the one
 for the protocol-dependent baking binaries:
 
 ```bash
-./octez-experimental-agnostic-baker [OCTEZ-BAKER-COMMANDS]
+./octez-agnostic-baker [OCTEZ-BAKER-COMMANDS]
 ```
 
 The `[OCTEZ-BAKER-COMMANDS]` list consists of all the arguments that can be used
-- 
GitLab


From 028730a89ee10ea113185555527c19ca9bda20cf Mon Sep 17 00:00:00 2001
From: Gabriel Moise <gabriel.moise@trili.tech>
Date: Tue, 8 Apr 2025 15:16:21 +0100
Subject: [PATCH 5/5] Tezt: Protocol_migration: Remove unnecessary tag

---
 tezt/tests/protocol_migration.ml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tezt/tests/protocol_migration.ml b/tezt/tests/protocol_migration.ml
index 00a07244496e..c47a5a857c31 100644
--- a/tezt/tests/protocol_migration.ml
+++ b/tezt/tests/protocol_migration.ml
@@ -545,7 +545,6 @@ let test_migration_with_bakers ?(migration_level = 4)
         team;
         "protocol";
         "migration";
-        "agnostic_baker";
         "attesting";
         "metadata";
         "from_" ^ Protocol.tag migrate_from;
@@ -645,7 +644,6 @@ let test_forked_migration_manual ?(migration_level = 4)
         team;
         "protocol";
         "migration";
-        "agnostic_baker";
         "attesting";
         "fork";
         "manual";
@@ -847,7 +845,6 @@ let test_forked_migration_bakers ~migrate_from ~migrate_to =
     ~tags:
       ([team; "protocol"; "migration"]
       @ [
-          "agnostic_baker";
           "attesting";
           "fork";
           "from_" ^ Protocol.tag migrate_from;
@@ -889,7 +886,7 @@ let test_forked_migration_bakers ~migrate_from ~migrate_to =
   and* () = connect cn2 cn3 in
 
   Log.info
-    "Partition bootstrap delegates into 3 groups. Start agnostic bakers, on a \
+    "Partition bootstrap delegates into 3 groups. Start agnostic bakers on a \
      separate node for each group of delegates." ;
   (* The groups are chosen considering baker rights at levels 4 and 5,
      see comment further below. *)
-- 
GitLab