From 348430b9b656a52961b43fa659adba4fa62c1abc Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Wed, 16 Apr 2025 17:59:07 +0200 Subject: [PATCH 1/6] Baker/Manifest: remove agnostic from binary and public packages --- .dockerignore | 2 +- .gitignore | 2 +- .gitlab/ci/pipelines/schedule_extended_test.yml | 4 ++-- dune-project | 4 ++-- manifest/product_octez.ml | 6 +++--- opam/octez-accuser.opam | 2 +- .../{octez-agnostic-baker-lib.opam => octez-baker-lib.opam} | 0 opam/{octez-agnostic-baker.opam => octez-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_accuser/dune | 2 +- src/bin_agnostic_baker/dune | 6 +++--- src/lib_agnostic_baker/dune | 2 +- src/proto_021_PsQuebec/lib_agnostic_baker/dune | 2 +- src/proto_022_PsRiotum/lib_agnostic_baker/dune | 2 +- src/proto_alpha/lib_agnostic_baker/dune | 2 +- tobi/config | 4 ++-- 21 files changed, 29 insertions(+), 29 deletions(-) rename opam/{octez-agnostic-baker-lib.opam => octez-baker-lib.opam} (100%) rename opam/{octez-agnostic-baker.opam => octez-baker.opam} (89%) diff --git a/.dockerignore b/.dockerignore index 2cff9fde4777..81a475a859ab 100644 --- a/.dockerignore +++ b/.dockerignore @@ -40,7 +40,7 @@ octogram octez-teztale-archiver octez-teztale-server octez-accuser -octez-agnostic-baker +octez-baker scripts/opam-test-all.sh.DONE scripts/create_genesis/src diff --git a/.gitignore b/.gitignore index 3a73a1745e67..9f67b10b8d84 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,7 @@ __pycache__ /octez-teztale-archiver /octez-teztale-server /octez-accuser -/octez-agnostic-baker +/octez-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 9f3b5757af54..ff104ace76fb 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -1343,7 +1343,7 @@ opam:all_2: - octez-protocol-016-PtMumbai-libs - octez-protocol-000-Ps9mPmXa-libs - octez-injector - - octez-agnostic-baker-lib + - octez-baker-lib opam:all_1: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1658,7 +1658,7 @@ opam:exec_1: - octez-client - octez-baker-PsRiotum - octez-baker-PsQuebec - - octez-agnostic-baker + - octez-baker - octez-accuser-PsRiotum - octez-accuser-PsQuebec - octez-accuser diff --git a/dune-project b/dune-project index 14be4e75eed3..ed0b3815e0a6 100644 --- a/dune-project +++ b/dune-project @@ -20,12 +20,12 @@ (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)) (package (name octez-baker-PsQuebec)) (package (name octez-baker-PsRiotum)) (package (name octez-baker-alpha)) +(package (name octez-baker-lib)) (package (name octez-client)) (package (name octez-codec)) (package (name octez-codec-kaitai)) diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index 084feef784f6..17773c4e506e 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -5661,7 +5661,7 @@ let _octez_scoru_wasm_fast_tests = let octez_agnostic_baker_lib = let (PPX {preprocess; preprocessor_deps}) = ppx_profiler in public_lib - "octez-agnostic-baker-lib" + "octez-baker-lib" ~path:"src/lib_agnostic_baker" ~internal_name:"octez_agnostic_baker" ~synopsis:"Octez: library for Agnostic Baker" @@ -8580,10 +8580,10 @@ let _octez_agnostic_baker = List.map deps_for_protocol Protocol.all |> List.flatten in public_exe - "octez-agnostic-baker" + "octez-baker" ~path:"src/bin_agnostic_baker" ~internal_name:"main_agnostic_baker" - ~synopsis:"Tezos: `octez-agnostic-baker` binary for baking" + ~synopsis:"Tezos: `octez-baker` binary for baking" ~preprocess ~preprocessor_deps ~release_status:Released diff --git a/opam/octez-accuser.opam b/opam/octez-accuser.opam index 1d76174cbc5f..4d4cdf27de6a 100644 --- a/opam/octez-accuser.opam +++ b/opam/octez-accuser.opam @@ -14,7 +14,7 @@ depends: [ "octez-rust-deps" { = version } "bls12-381" { = version } "octez-shell-libs" { = version } - "octez-agnostic-baker-lib" { = version } + "octez-baker-lib" { = version } "octez-protocol-021-PsQuebec-libs" { = version } "octez-protocol-022-PsRiotum-libs" { = version } ] diff --git a/opam/octez-agnostic-baker-lib.opam b/opam/octez-baker-lib.opam similarity index 100% rename from opam/octez-agnostic-baker-lib.opam rename to opam/octez-baker-lib.opam diff --git a/opam/octez-agnostic-baker.opam b/opam/octez-baker.opam similarity index 89% rename from opam/octez-agnostic-baker.opam rename to opam/octez-baker.opam index 47f4df04f570..c4d4afc36965 100644 --- a/opam/octez-agnostic-baker.opam +++ b/opam/octez-baker.opam @@ -14,7 +14,7 @@ depends: [ "octez-rust-deps" { = version } "bls12-381" { = version } "octez-shell-libs" { = version } - "octez-agnostic-baker-lib" { = version } + "octez-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-agnostic-baker` binary for baking" +synopsis: "Tezos: `octez-baker` binary for baking" diff --git a/opam/octez-protocol-021-PsQuebec-libs.opam b/opam/octez-protocol-021-PsQuebec-libs.opam index 9ed44329634f..79f6b6052644 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-agnostic-baker-lib" { = version } + "octez-baker-lib" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } "octez-alcotezt" { with-test & = version } diff --git a/opam/octez-protocol-022-PsRiotum-libs.opam b/opam/octez-protocol-022-PsRiotum-libs.opam index 35e66e81e4c0..060e3aeb9cfe 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-agnostic-baker-lib" { = version } + "octez-baker-lib" { = version } "octez-injector" { = version } "octez-l2-libs" { = version } "octez-alcotezt" { with-test & = version } diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam index 26cc26cf40ec..c164d78e1d34 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-agnostic-baker-lib" { = version } + "octez-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 011603ddce7d..33dea56181fb 100644 --- a/script-inputs/ci-opam-package-tests +++ b/script-inputs/ci-opam-package-tests @@ -4,11 +4,11 @@ efunc_core all 6 octez-accuser exec 1 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 exec 1 octez-baker-PsQuebec exec 1 octez-baker-PsRiotum exec 1 +octez-baker-lib all 2 octez-client exec 1 octez-codec exec 1 octez-crawler all 4 diff --git a/script-inputs/octez-released-executables b/script-inputs/octez-released-executables index 874050eb084e..54f6caa84403 100644 --- a/script-inputs/octez-released-executables +++ b/script-inputs/octez-released-executables @@ -6,7 +6,7 @@ octez-codec octez-client octez-admin-client octez-accuser -octez-agnostic-baker +octez-baker octez-node octez-accuser-PsRiotum octez-baker-PsRiotum diff --git a/script-inputs/released-executables b/script-inputs/released-executables index 874050eb084e..54f6caa84403 100644 --- a/script-inputs/released-executables +++ b/script-inputs/released-executables @@ -6,7 +6,7 @@ octez-codec octez-client octez-admin-client octez-accuser -octez-agnostic-baker +octez-baker octez-node octez-accuser-PsRiotum octez-baker-PsRiotum diff --git a/src/bin_agnostic_accuser/dune b/src/bin_agnostic_accuser/dune index 390efe12addf..aa88c0d40ae7 100644 --- a/src/bin_agnostic_accuser/dune +++ b/src/bin_agnostic_accuser/dune @@ -12,7 +12,7 @@ octez-libs.base octez-libs.base.unix octez-shell-libs.client-base-unix - octez-agnostic-baker-lib + octez-baker-lib octez-protocol-021-PsQuebec-libs.agnostic-baker octez-protocol-022-PsRiotum-libs.agnostic-baker (select void_for_linking-octez-protocol-alpha-libs-agnostic-baker from diff --git a/src/bin_agnostic_baker/dune b/src/bin_agnostic_baker/dune index 1add15ba0aa5..a46efe378b7c 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-agnostic-baker) - (package octez-agnostic-baker) + (public_name octez-baker) + (package octez-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-agnostic-baker-lib + octez-baker-lib octez-libs.octez-profiler octez-protocol-021-PsQuebec-libs.agnostic-baker octez-protocol-022-PsRiotum-libs.agnostic-baker diff --git a/src/lib_agnostic_baker/dune b/src/lib_agnostic_baker/dune index a0031742fbac..8675d50e9fc5 100644 --- a/src/lib_agnostic_baker/dune +++ b/src/lib_agnostic_baker/dune @@ -3,7 +3,7 @@ (library (name octez_agnostic_baker) - (public_name octez-agnostic-baker-lib) + (public_name octez-baker-lib) (instrumentation (backend bisect_ppx)) (libraries bls12-381.archive diff --git a/src/proto_021_PsQuebec/lib_agnostic_baker/dune b/src/proto_021_PsQuebec/lib_agnostic_baker/dune index f6c409967447..ade998a4e4cf 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-agnostic-baker-lib) + octez-baker-lib) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_022_PsRiotum/lib_agnostic_baker/dune b/src/proto_022_PsRiotum/lib_agnostic_baker/dune index b3a7b990f35e..f1532f1d111c 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-agnostic-baker-lib) + octez-baker-lib) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_agnostic_baker/dune b/src/proto_alpha/lib_agnostic_baker/dune index c7e8e448313e..9f441e2c15ff 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-agnostic-baker-lib) + octez-baker-lib) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/tobi/config b/tobi/config index a5eeee27d2c7..d335fa553f95 100644 --- a/tobi/config +++ b/tobi/config @@ -51,12 +51,12 @@ octez-accuser: src/bin_agnostic_accuser 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: src/bin_agnostic_baker octez-baker-PsQuebec: src/proto_021_PsQuebec/bin_baker octez-baker-PsRiotum: src/proto_022_PsRiotum/bin_baker octez-baker-alpha: src/proto_alpha/bin_baker +octez-baker-lib: src/lib_agnostic_baker octez-client: src/bin_client octez-codec: src/bin_codec octez-codec-kaitai: client-libs/bin_codec_kaitai -- GitLab From 51ef762ff09e8bc04b4f936fd7b622cd149a5614 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Wed, 16 Apr 2025 18:02:10 +0200 Subject: [PATCH 2/6] Baker/Tezt: update with new binary name --- tezt/lib_cloud/dockerfiles/dal.Dockerfile | 2 +- tezt/lib_tezos/agnostic_baker.mli | 4 +- tezt/lib_tezos/constant.ml | 2 +- .../runtime-dependency-tags.out | 2 +- tezt/lib_wrapper/tezt_wrapper.ml | 3 +- tezt/lib_wrapper/tezt_wrapper.mli | 2 +- .../Agnostic baker man.out | 42 +++++++++---------- 7 files changed, 28 insertions(+), 29 deletions(-) diff --git a/tezt/lib_cloud/dockerfiles/dal.Dockerfile b/tezt/lib_cloud/dockerfiles/dal.Dockerfile index e097e50a1f23..0a485602d23d 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-agnostic-baker $BINARIES_DESTINATION_PATH/octez-agnostic-baker +COPY ./octez-baker $BINARIES_DESTINATION_PATH/octez-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 537a98f68327..7344da7aeb8b 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-agnostic-baker run]. +(** Spawn [octez-baker run]. The resulting promise is fulfilled as soon as the agnostic baker has been spawned. It continues running in the background. *) @@ -56,7 +56,7 @@ val run : t -> unit Lwt.t -(** Spawn [octez-agnostic-baker run] similarly to {!run} but returns the process. *) +(** Spawn [octez-baker run] similarly to {!run} but returns the process. *) val spawn_run : ?env:string String_map.t -> t -> Process.t (** Liquidity baking vote values. *) diff --git a/tezt/lib_tezos/constant.ml b/tezt/lib_tezos/constant.ml index 6c4ada6ec74d..a3eca961a761 100644 --- a/tezt/lib_tezos/constant.ml +++ b/tezt/lib_tezos/constant.ml @@ -165,7 +165,7 @@ module WASM = struct end let octez_agnostic_baker = - Uses.make ~tag:"agnostic_baker" ~path:"./octez-agnostic-baker" () + Uses.make ~tag:"agnostic_baker" ~path:"./octez-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 93ca0d5358c4..90b192534a0c 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 @@ -12,7 +12,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 +agnostic_baker: octez-baker baker_psquebec: octez-baker-PsQuebec baker_psriotum: octez-baker-PsRiotum baker_alpha: octez-baker-alpha diff --git a/tezt/lib_wrapper/tezt_wrapper.ml b/tezt/lib_wrapper/tezt_wrapper.ml index 5d71d3a89d93..abb483e68704 100644 --- a/tezt/lib_wrapper/tezt_wrapper.ml +++ b/tezt/lib_wrapper/tezt_wrapper.ml @@ -57,8 +57,7 @@ module Uses = struct let octez_admin_client = make ~tag:"admin_client" ~path:"./octez-admin-client" () - let octez_agnostic_baker = - make ~tag:"agnostic_baker" ~path:"./octez-agnostic-baker" () + let octez_agnostic_baker = make ~tag:"agnostic_baker" ~path:"./octez-baker" () let register_meta_test () = Regression.register diff --git a/tezt/lib_wrapper/tezt_wrapper.mli b/tezt/lib_wrapper/tezt_wrapper.mli index 266191427340..b479221c1d1f 100644 --- a/tezt/lib_wrapper/tezt_wrapper.mli +++ b/tezt/lib_wrapper/tezt_wrapper.mli @@ -81,7 +81,7 @@ module Uses : sig (** ["./octez-admin-client"], with tag ["admin_client"]. *) val octez_admin_client : t - (** ["./octez-agnostic-baker"], with tag ["agnostic_baker"]. *) + (** ["./octez-baker"], with tag ["agnostic_baker"]. *) val octez_agnostic_baker : t (** Register a test that generates: diff --git a/tezt/tests/expected/agnostic_baker_test.ml/Agnostic baker man.out b/tezt/tests/expected/agnostic_baker_test.ml/Agnostic baker man.out index 9222451f555a..bb2a8385e923 100644 --- a/tezt/tests/expected/agnostic_baker_test.ml/Agnostic baker man.out +++ b/tezt/tests/expected/agnostic_baker_test.ml/Agnostic baker man.out @@ -1,14 +1,14 @@ -./octez-agnostic-baker +./octez-baker Usage: - octez-agnostic-baker [global options] command [command options] - octez-agnostic-baker --help (for global options) - octez-agnostic-baker [global options] command --help (for command options) - octez-agnostic-baker --version (for version information) + octez-baker [global options] command [command options] + octez-baker --help (for global options) + octez-baker [global options] command --help (for command options) + octez-baker --version (for version information) To browse the documentation: - octez-agnostic-baker [global options] man (for a list of commands) - octez-agnostic-baker [global options] man -v 3 (for the full manual) + octez-baker [global options] man (for a list of commands) + octez-baker [global options] man -v 3 (for the full manual) Global options (must come before the command): -d --base-dir : client data directory (absent: TEZOS_CLIENT_DIR env) @@ -51,16 +51,16 @@ Global options (must come before the command): --log-coloring : Enable or disable light coloring in default stdout logs. Coloring is enabled by default. -./octez-agnostic-baker --help +./octez-baker --help Usage: - octez-agnostic-baker [global options] command [command options] - octez-agnostic-baker --help (for global options) - octez-agnostic-baker [global options] command --help (for command options) - octez-agnostic-baker --version (for version information) + octez-baker [global options] command [command options] + octez-baker --help (for global options) + octez-baker [global options] command --help (for command options) + octez-baker --version (for version information) To browse the documentation: - octez-agnostic-baker [global options] man (for a list of commands) - octez-agnostic-baker [global options] man -v 3 (for the full manual) + octez-baker [global options] man (for a list of commands) + octez-baker [global options] man -v 3 (for the full manual) Global options (must come before the command): -d --base-dir : client data directory (absent: TEZOS_CLIENT_DIR env) @@ -103,16 +103,16 @@ Global options (must come before the command): --log-coloring : Enable or disable light coloring in default stdout logs. Coloring is enabled by default. -./octez-agnostic-baker man +./octez-baker man Usage: - octez-agnostic-baker [global options] command [command options] - octez-agnostic-baker --help (for global options) - octez-agnostic-baker [global options] command --help (for command options) - octez-agnostic-baker --version (for version information) + octez-baker [global options] command [command options] + octez-baker --help (for global options) + octez-baker [global options] command --help (for command options) + octez-baker --version (for version information) To browse the documentation: - octez-agnostic-baker [global options] man (for a list of commands) - octez-agnostic-baker [global options] man -v 3 (for the full manual) + octez-baker [global options] man (for a list of commands) + octez-baker [global options] man -v 3 (for the full manual) Global options (must come before the command): -d --base-dir : client data directory (absent: TEZOS_CLIENT_DIR env) -- GitLab From 209401386f739f679fdaef59f960b2db446d27e2 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Wed, 16 Apr 2025 18:04:01 +0200 Subject: [PATCH 3/6] Baker/Docs: update with new binary name --- CHANGES.rst | 2 +- docs/CHANGES.rst | 2 +- src/bin_agnostic_baker/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index c2fa396c1c02..8434630e3b38 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -97,7 +97,7 @@ Agnostic Baker - Fix the support of ``--keep-alive`` for the agnostic baker. (MR :gl:`!17685`) -- The agnostic baker binary becomes ``octez-agnostic-baker``. (MR :gl:`!17491`) +- The agnostic baker binary becomes ``octez-baker``. (MR :gl:`!17491`, :gl:`!17747`) - 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 149253c84c01..1a0dea0f8f5e 100644 --- a/docs/CHANGES.rst +++ b/docs/CHANGES.rst @@ -155,7 +155,7 @@ Smart Rollup node Agnostic Baker -------------- -- The agnostic baker binary becomes ``octez-agnostic-baker``. (MR :gl:`!17491`) +- The agnostic baker binary becomes ``octez-baker``. (MR :gl:`!17491`, :gl:`!17747`) - Released agnostic baker binary as experimental. (MR :gl:`!16318`) diff --git a/src/bin_agnostic_baker/README.md b/src/bin_agnostic_baker/README.md index 65bc65c57b94..184d8395a7a4 100644 --- a/src/bin_agnostic_baker/README.md +++ b/src/bin_agnostic_baker/README.md @@ -17,7 +17,7 @@ To run the agnostic baker, the command line syntax is similar to the one for the protocol-dependent baking binaries: ```bash -./octez-agnostic-baker [OCTEZ-BAKER-COMMANDS] +./octez-baker [OCTEZ-BAKER-COMMANDS] ``` The `[OCTEZ-BAKER-COMMANDS]` list consists of all the arguments that can be used -- GitLab From 64e3c30155633afd00b564a0e4b3b960ef82c3ea Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Wed, 16 Apr 2025 18:21:54 +0200 Subject: [PATCH 4/6] Baker/Packages: update with new binary name --- scripts/packaging/octez/debian/octez-agnostic-baker.install | 2 +- scripts/packaging/octez/debian/octez-agnostic-baker.manpages | 2 +- .../octez-agnostic-baker.octez-agnostic-baker-bin.service | 2 +- scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/packaging/octez/debian/octez-agnostic-baker.install b/scripts/packaging/octez/debian/octez-agnostic-baker.install index 2746bc188ed7..6bd44283b290 100644 --- a/scripts/packaging/octez/debian/octez-agnostic-baker.install +++ b/scripts/packaging/octez/debian/octez-agnostic-baker.install @@ -1,4 +1,4 @@ -binaries/octez-agnostic-baker /usr/bin/ +binaries/octez-baker /usr/bin/ binaries/octez-accuser-P* /usr/bin/ scripts/wait-for-node-up.sh /usr/share/octez-agnostic-baker/ scripts/systemd-octez-agnostic-baker.sh /usr/share/octez-agnostic-baker/ diff --git a/scripts/packaging/octez/debian/octez-agnostic-baker.manpages b/scripts/packaging/octez/debian/octez-agnostic-baker.manpages index 3f2d556c7342..24ddd9f55431 100644 --- a/scripts/packaging/octez/debian/octez-agnostic-baker.manpages +++ b/scripts/packaging/octez/debian/octez-agnostic-baker.manpages @@ -1,2 +1,2 @@ -manpages/octez-agnostic-baker.1 +manpages/octez-baker.1 manpages/octez-accuser.1 diff --git a/scripts/packaging/octez/debian/octez-agnostic-baker.octez-agnostic-baker-bin.service b/scripts/packaging/octez/debian/octez-agnostic-baker.octez-agnostic-baker-bin.service index 3f1fd1165d3a..63ada3d127d1 100644 --- a/scripts/packaging/octez/debian/octez-agnostic-baker.octez-agnostic-baker-bin.service +++ b/scripts/packaging/octez/debian/octez-agnostic-baker.octez-agnostic-baker-bin.service @@ -17,7 +17,7 @@ User=tezos ExecStartPre=+touch /var/log/tezos/agnostic-baker.log ExecStartPre=+chown tezos:tezos /var/log/tezos/agnostic-baker.log -ExecStart=/bin/sh -c "/usr/bin/octez-agnostic-baker --base-dir $HOME/.tezos-client run with local node $DATADIR --liquidity-baking-toggle-vote $LQVOTE $RUNTIME_OPTS $BAKING_KEY" +ExecStart=/bin/sh -c "/usr/bin/octez-baker --base-dir $HOME/.tezos-client run with local node $DATADIR --liquidity-baking-toggle-vote $LQVOTE $RUNTIME_OPTS $BAKING_KEY" StandardOutput=append:/var/log/tezos/agnostic-baker.log StandardError=inherit diff --git a/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec b/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec index 562bc9fd981e..4a93ca2c36d8 100644 --- a/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec +++ b/scripts/packaging/octez/rpm/SPECS/octez-agnostic-baker.spec @@ -19,7 +19,7 @@ Requires(pre): octez-client %install mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/share/octez-agnostic-baker -install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-agnostic-baker %{buildroot}/usr/bin/ +install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-baker %{buildroot}/usr/bin/ install -m 0755 $HOME/rpmbuild/SPECS/binaries/octez-accuser-P* %{buildroot}/usr/bin/ install -m 0755 $HOME/rpmbuild/SPECS/scripts/wait-for-node-up.sh %{buildroot}/usr/share/octez-agnostic-baker/ install -m 0755 $HOME/rpmbuild/SPECS/scripts/systemd-octez-agnostic-baker.sh %{buildroot}/usr/share/octez-agnostic-baker/ @@ -33,7 +33,7 @@ install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.octez-agnostic-baker install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.octez-accuser.default %{buildroot}/etc/default/octez-accuser install -D -m 644 $HOME/rpmbuild/SPECS/octez-agnostic-baker.default %{buildroot}/etc/default/octez-baker %files -/usr/bin/octez-agnostic-baker +/usr/bin/octez-baker /usr/bin/octez-accuser-* /usr/share/octez-agnostic-baker/wait-for-node-up.sh /usr/share/octez-agnostic-baker/systemd-octez-agnostic-baker.sh -- GitLab From ea0abb3f0c4a575fbebe71438f523f170766626e Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Wed, 16 Apr 2025 18:24:00 +0200 Subject: [PATCH 5/6] Baker/Sandbox: update with new binary name --- src/bin_client/octez-init-sandboxed-client.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin_client/octez-init-sandboxed-client.sh b/src/bin_client/octez-init-sandboxed-client.sh index 9d85de65d3b4..43bd38f691f8 100755 --- a/src/bin_client/octez-init-sandboxed-client.sh +++ b/src/bin_client/octez-init-sandboxed-client.sh @@ -154,9 +154,9 @@ main() { echo "exec $baker \"\$@\"" >> "$client_dir"/bin/octez-baker-"$protocol_without_number" chmod +x "$client_dir"/bin/octez-baker-"$protocol_without_number" - echo '#!/bin/sh' > "$client_dir"/bin/octez-agnostic-baker - echo "exec $agnostic_baker \"\$@\"" >> "$client_dir"/bin/octez-agnostic-baker - chmod +x "$client_dir"/bin/octez-agnostic-baker + echo '#!/bin/sh' > "$client_dir"/bin/octez-baker + echo "exec $agnostic_baker \"\$@\"" >> "$client_dir"/bin/octez-baker + chmod +x "$client_dir"/bin/octez-baker echo '#!/bin/sh' > "$client_dir"/bin/octez-accuser echo "exec $agnostic_accuser \"\$@\"" >> "$client_dir"/bin/octez-accuser -- GitLab From 31f90d6a271a9b50bb113fa0b4292ebdec01b5db Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Wed, 16 Apr 2025 18:23:15 +0200 Subject: [PATCH 6/6] Baker: update daily log path --- src/lib_agnostic_baker/parameters.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_agnostic_baker/parameters.ml b/src/lib_agnostic_baker/parameters.ml index 19f0af57c506..08fe4d6a1ebe 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-agnostic-baker" +let default_daily_logs_path = Some "octez-baker" let extra_levels_for_old_baker = 3 -- GitLab