From 03ea76f7b660c7702b9ea1a2447cb664880f9345 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 7 Mar 2024 15:05:56 +0100 Subject: [PATCH 1/9] Version: Add product information --- src/lib_version/exe/tezos_print_version.ml | 9 +++++---- src/lib_version/parser/tezos_version_parser.mll | 9 ++++++++- src/lib_version/version.ml | 12 +++++++++--- src/lib_version/version.mli | 11 +++++++++-- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/lib_version/exe/tezos_print_version.ml b/src/lib_version/exe/tezos_print_version.ml index 73f43d396021..53016ebf4391 100644 --- a/src/lib_version/exe/tezos_print_version.ml +++ b/src/lib_version/exe/tezos_print_version.ml @@ -1,7 +1,7 @@ (*****************************************************************************) (* *) (* Open Source License *) -(* Copyright (c) 2020 Nomadic Labs, *) +(* Copyright (c) 2020-2024 Nomadic Labs, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -29,10 +29,11 @@ open Version open Current_git_info -let to_json {major; minor; additional_info} = +let to_json {product; major; minor; additional_info} = Format.sprintf - "{ \"major\": \"%i\", \"minor\": \"%i\", \"info\": \"%s\", \"hash\": \ - \"%s\" }" + "{ \"product\": \"%s\", \"major\": \"%i\", \"minor\": \"%i\", \"info\": \ + \"%s\", \"hash\": \"%s\" }" + (string_of_product product) major minor (string_of_additional_info additional_info) diff --git a/src/lib_version/parser/tezos_version_parser.mll b/src/lib_version/parser/tezos_version_parser.mll index e7f3a5d4a3a0..ba2375b49807 100644 --- a/src/lib_version/parser/tezos_version_parser.mll +++ b/src/lib_version/parser/tezos_version_parser.mll @@ -27,14 +27,20 @@ | RC_dev of int | Release [@@deriving show] + type product = Octez + + let pp_product ppf = function + | Octez -> Format.fprintf ppf "Octez" + type t = { + product: product; major : int; minor : int; additional_info : additional_info} [@@deriving show] let int s = int_of_string_opt s |> Option.value ~default: 0 - let default = { major = 0 ; minor = 0 ; additional_info = Dev } + let default = { product = Octez; major = 0 ; minor = 0 ; additional_info = Dev } } let num = ['0'-'9']+ @@ -42,6 +48,7 @@ let num = ['0'-'9']+ rule version_tag = parse | "octez-" 'v'? (num as major) '.' (num as minor) ".0"? { Some { + product = Octez; major = int major; minor = int minor; additional_info = extra lexbuf } diff --git a/src/lib_version/version.ml b/src/lib_version/version.ml index 6c0ec36a7740..13468c72daf1 100644 --- a/src/lib_version/version.ml +++ b/src/lib_version/version.ml @@ -1,7 +1,7 @@ (*****************************************************************************) (* *) (* Open Source License *) -(* Copyright (c) 2020 Nomadic Labs, *) +(* Copyright (c) 2020-2024 Nomadic Labs, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -31,7 +31,10 @@ type additional_info = Tezos_version_parser.additional_info = | RC_dev of int | Release +type product = Tezos_version_parser.product = Octez + type t = Tezos_version_parser.t = { + product : product; major : int; minor : int; additional_info : additional_info; @@ -47,10 +50,13 @@ let string_of_additional_info = function | RC_dev n -> Format.asprintf "~rc%d+dev" n | Release -> "" -let pp f {major; minor; additional_info} = +let string_of_product = function Octez -> "Octez" + +let pp f {product; major; minor; additional_info} = Format.fprintf f - "%i.%i%s" + "%s %i.%i%s" + (string_of_product product) major minor (string_of_additional_info additional_info) diff --git a/src/lib_version/version.mli b/src/lib_version/version.mli index 3603c07080f2..6e4c78253855 100644 --- a/src/lib_version/version.mli +++ b/src/lib_version/version.mli @@ -1,7 +1,7 @@ (*****************************************************************************) (* *) (* Open Source License *) -(* Copyright (c) 2020 Nomadic Labs, *) +(* Copyright (c) 2020-2024 Nomadic Labs, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -64,7 +64,13 @@ type additional_info = Tezos_version_parser.additional_info = The result is a string of the form ["+dev"], ["~rcX"], ["~rcX+dev"] or [""]. *) val string_of_additional_info : additional_info -> string -(** Version information. +(** Product information. *) +type product = Tezos_version_parser.product = Octez + +(** Convert the product information to a string. *) +val string_of_product : product -> string + +(** Version information of the [product]. Major versions include significant new features and are usually released in new branches which start from master. @@ -73,6 +79,7 @@ val string_of_additional_info : additional_info -> string branches which start from the previous release. When the major version is incremented, the minor version is reset to 0. *) type t = Tezos_version_parser.t = { + product : product; major : int; minor : int; additional_info : additional_info; -- GitLab From a9d2b10d6179b26d52969e908a27bbdabdcf4189 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 7 Mar 2024 16:09:39 +0100 Subject: [PATCH 2/9] Version: Add --product argument to print_version --- src/lib_version/exe/tezos_print_version.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_version/exe/tezos_print_version.ml b/src/lib_version/exe/tezos_print_version.ml index 53016ebf4391..9dcb94843ba4 100644 --- a/src/lib_version/exe/tezos_print_version.ml +++ b/src/lib_version/exe/tezos_print_version.ml @@ -43,10 +43,11 @@ let help_string = "This script prints out the current version of the\n\ node as it is deduced from the git tag of the current branch.\n\ print_version \ - [--major|--minor|--additional-info|--full|--full-with-commit|--commit]" + [--product|--major|--minor|--additional-info|--full|--full-with-commit|--commit]" let () = match Sys.argv with + | [|_; "--product"|] -> print_endline (string_of_product version.product) | [|_; "--major"|] -> print_endline (string_of_int version.major) | [|_; "--minor"|] -> print_endline (string_of_int version.minor) | [|_; "--additional-info"|] -> -- GitLab From 0735d1d017caf81445c2497807b0d07e340443e7 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 11 Mar 2024 10:24:33 +0100 Subject: [PATCH 3/9] Changes: Add entry for version product --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 77e8287ffe94..0d14e2bb7349 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -203,3 +203,5 @@ Miscellaneous - **Breaking change** Switch encoding of ``nread_total`` field of ``P2p_events.read_fd`` in Octez-p2p library to ``Data_encoding.int64`` to fix an overflow. + +- Versions now include information about the product. (MR :gl:`!12366`) -- GitLab From 19171c7b3164b3647257b9c70cc5c0c14679cc62 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 11 Mar 2024 16:16:36 +0100 Subject: [PATCH 4/9] Version: rename tezos_print_version to octez_print_version --- manifest/main.ml | 4 ++-- src/lib_version/exe/dune | 4 ++-- .../exe/{tezos_print_version.ml => octez_print_version.ml} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/lib_version/exe/{tezos_print_version.ml => octez_print_version.ml} (97%) diff --git a/manifest/main.ml b/manifest/main.ml index f83b5b619fba..380d9d81c3d2 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2605,12 +2605,12 @@ let _octez_version_get_git_info = let _octez_print_version_exe = public_exe "octez-version" - ~internal_name:"tezos_print_version" + ~internal_name:"octez_print_version" ~path:"src/lib_version/exe" ~opam:"octez-version" ~deps: [octez_version_value |> open_; octez_version |> open_; octez_base_unix] - ~modules:["tezos_print_version"] + ~modules:["octez_print_version"] ~bisect_ppx:No let _octez_version_tests = diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune index 73fed2d85216..ecd91f85ef81 100644 --- a/src/lib_version/exe/dune +++ b/src/lib_version/exe/dune @@ -9,7 +9,7 @@ (modules get_git_info)) (executable - (name tezos_print_version) + (name octez_print_version) (public_name octez-version) (package octez-version) (libraries @@ -23,4 +23,4 @@ (:standard) -open Tezos_version_value -open Tezos_version) - (modules tezos_print_version)) + (modules octez_print_version)) diff --git a/src/lib_version/exe/tezos_print_version.ml b/src/lib_version/exe/octez_print_version.ml similarity index 97% rename from src/lib_version/exe/tezos_print_version.ml rename to src/lib_version/exe/octez_print_version.ml index 9dcb94843ba4..9b5cc40c754d 100644 --- a/src/lib_version/exe/tezos_print_version.ml +++ b/src/lib_version/exe/octez_print_version.ml @@ -41,7 +41,7 @@ let to_json {product; major; minor; additional_info} = let help_string = "This script prints out the current version of the\n\ - node as it is deduced from the git tag of the current branch.\n\ + octez node as it is deduced from the git tag of the current branch.\n\ print_version \ [--product|--major|--minor|--additional-info|--full|--full-with-commit|--commit]" -- GitLab From 74594006c818ec1b6abac6cdbe446b38d46abf96 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 11 Mar 2024 16:19:57 +0100 Subject: [PATCH 5/9] Version: Rename version to octez_version --- contrib/bin_codec_kaitai/codec.ml | 4 +++- src/lib_shell/test/test_node.ml | 9 ++++++--- src/lib_version/exe/octez_print_version.ml | 15 ++++++++------- src/lib_version/value/bin_version.ml | 8 ++++---- src/lib_version/value/bin_version.mli | 8 ++++---- src/lib_version/value/current_git_info.ml | 2 +- src/lib_version/value/current_git_info.mli | 4 ++-- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/contrib/bin_codec_kaitai/codec.ml b/contrib/bin_codec_kaitai/codec.ml index 387f1678f449..d7cd272ba99f 100644 --- a/contrib/bin_codec_kaitai/codec.ml +++ b/contrib/bin_codec_kaitai/codec.ml @@ -169,7 +169,9 @@ let main commands = match r with | Ok () -> Lwt.return 0 | Error [Tezos_clic.Version] -> - let version = Tezos_version_value.Bin_version.version_string in + let version = + Tezos_version_value.Bin_version.octez_version_string + in Format.printf "%s\n" version ; Lwt.return 0 | Error [Tezos_clic.Help command] -> diff --git a/src/lib_shell/test/test_node.ml b/src/lib_shell/test/test_node.ml index 9c2f4aa8f867..c05d50659a2c 100644 --- a/src/lib_shell/test/test_node.ml +++ b/src/lib_shell/test/test_node.ml @@ -112,7 +112,8 @@ let ( let*?? ) m f = [p2p_layer_disabled]. *) let node_sandbox_initialization_events sandbox_parameters config _switch () = let version = - Tezos_version.Version.to_string Tezos_version_value.Current_git_info.version + Tezos_version.Version.to_string + Tezos_version_value.Current_git_info.octez_version in let commit_info = ({ @@ -159,7 +160,8 @@ let node_sandbox_initialization_events sandbox_parameters config _switch () = [bootstrapping] and [p2p_maintain_started]. *) let node_initialization_events _sandbox_parameters config _switch () = let version = - Tezos_version.Version.to_string Tezos_version_value.Current_git_info.version + Tezos_version.Version.to_string + Tezos_version_value.Current_git_info.octez_version in let commit_info = ({ @@ -211,7 +213,8 @@ let node_initialization_events _sandbox_parameters config _switch () = let node_store_known_protocol_events _sandbox_parameters config _switch () = let version = - Tezos_version.Version.to_string Tezos_version_value.Current_git_info.version + Tezos_version.Version.to_string + Tezos_version_value.Current_git_info.octez_version in let commit_info = ({ diff --git a/src/lib_version/exe/octez_print_version.ml b/src/lib_version/exe/octez_print_version.ml index 9b5cc40c754d..2966fd1cb6fd 100644 --- a/src/lib_version/exe/octez_print_version.ml +++ b/src/lib_version/exe/octez_print_version.ml @@ -47,17 +47,18 @@ let help_string = let () = match Sys.argv with - | [|_; "--product"|] -> print_endline (string_of_product version.product) - | [|_; "--major"|] -> print_endline (string_of_int version.major) - | [|_; "--minor"|] -> print_endline (string_of_int version.minor) + | [|_; "--product"|] -> + print_endline (string_of_product octez_version.product) + | [|_; "--major"|] -> print_endline (string_of_int octez_version.major) + | [|_; "--minor"|] -> print_endline (string_of_int octez_version.minor) | [|_; "--additional-info"|] -> - print_endline (string_of_additional_info version.additional_info) - | [|_; "--full"|] | [|_|] -> print_endline (to_string version) + print_endline (string_of_additional_info octez_version.additional_info) + | [|_; "--full"|] | [|_|] -> print_endline (to_string octez_version) | [|_; "--full-with-commit"|] -> - print_endline Tezos_version_value.Bin_version.simple_version_string + print_endline Tezos_version_value.Bin_version.octez_simple_version_string | [|_; "--commit"|] -> print_endline Tezos_version_value.Current_git_info.abbreviated_commit_hash - | [|_; "--json"|] -> print_endline (to_json version) + | [|_; "--json"|] -> print_endline (to_json octez_version) | [|_; "--help"|] -> print_endline help_string | _ -> print_endline help_string ; diff --git a/src/lib_version/value/bin_version.ml b/src/lib_version/value/bin_version.ml index c5bb9f222d43..e14ca5a1226f 100644 --- a/src/lib_version/value/bin_version.ml +++ b/src/lib_version/value/bin_version.ml @@ -22,15 +22,15 @@ (* *) (*****************************************************************************) -let version_string = +let octez_version_string = Format.asprintf "%s (%s) (%s)" Current_git_info.abbreviated_commit_hash Current_git_info.committer_date - (Tezos_version.Version.to_string Current_git_info.version) + (Tezos_version.Version.to_string Current_git_info.octez_version) -let simple_version_string = +let octez_simple_version_string = Format.asprintf "%s (%s)" - (Tezos_version.Version.to_string Current_git_info.version) + (Tezos_version.Version.to_string Current_git_info.octez_version) Current_git_info.abbreviated_commit_hash diff --git a/src/lib_version/value/bin_version.mli b/src/lib_version/value/bin_version.mli index b49e3e279a22..6c6f7a1ea6f1 100644 --- a/src/lib_version/value/bin_version.mli +++ b/src/lib_version/value/bin_version.mli @@ -22,10 +22,10 @@ (* *) (*****************************************************************************) -(** Version string containing the abbreviated hash, commiter date and the current version. +(** octez version string containing the abbreviated hash, commiter date and the current version. This string is suitable for binaries to show when e.g. a [--version] flag is given. *) -val version_string : string +val octez_version_string : string -(** Version string containing only the current version and the abbreviated hash. *) -val simple_version_string : string +(** Octez version string containing only the current version and the abbreviated hash. *) +val octez_simple_version_string : string diff --git a/src/lib_version/value/current_git_info.ml b/src/lib_version/value/current_git_info.ml index 76db867b2098..2b43b93da63a 100644 --- a/src/lib_version/value/current_git_info.ml +++ b/src/lib_version/value/current_git_info.ml @@ -50,4 +50,4 @@ let committer_date = Generated_git_info.committer_date else raw_committer_date -let version = Generated_git_info.git_describe +let octez_version = Generated_git_info.git_describe diff --git a/src/lib_version/value/current_git_info.mli b/src/lib_version/value/current_git_info.mli index 61f1acbce459..2bcf3e3b3b60 100644 --- a/src/lib_version/value/current_git_info.mli +++ b/src/lib_version/value/current_git_info.mli @@ -29,6 +29,6 @@ val abbreviated_commit_hash : string val committer_date : string -(** current_version : is the version of the node. +(** Current version of the node octez node. it uses either the git tag or a default version *) -val version : Tezos_version.Version.t +val octez_version : Tezos_version.Version.t -- GitLab From 7595b41a66a0728d086bf46c542285a05a7dc984 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Sun, 10 Mar 2024 13:51:42 +0100 Subject: [PATCH 6/9] Nodes, Clients: Use octez_version --- etherlink/bin_node/lib_dev/services.ml | 2 +- etherlink/bin_node/lib_prod/services.ml | 2 +- etherlink/bin_node/main.ml | 2 +- src/bin_codec/codec.ml | 4 +++- src/bin_dal_node/cli.ml | 8 ++++---- src/bin_node/main.ml | 4 ++-- src/bin_node/node_run_command.ml | 5 +++-- src/bin_proxy_server/main_proxy_server.ml | 2 +- src/bin_snoop/commands.ml | 2 +- src/lib_client_base_unix/client_main_run.ml | 4 +++- src/lib_protocol_compiler/bin/main_native.ml | 2 +- src/lib_shell/node.ml | 2 +- src/lib_smart_rollup_node/metrics.ml | 2 +- src/lib_smart_rollup_node/rpc_directory.ml | 2 +- src/lib_smart_rollup_node/store_migration.ml | 2 +- src/lib_validation/command_line.ml | 2 +- src/lib_wasm_debugger/wasm_debugger.ml | 2 +- src/proto_018_Proxford/lib_delegate/client_daemon.ml | 6 +++--- src/proto_019_PtParisA/lib_delegate/client_daemon.ml | 6 +++--- src/proto_alpha/lib_delegate/client_daemon.ml | 6 +++--- 20 files changed, 36 insertions(+), 31 deletions(-) diff --git a/etherlink/bin_node/lib_dev/services.ml b/etherlink/bin_node/lib_dev/services.ml index 6d0dff8e5ce3..467b2894d614 100644 --- a/etherlink/bin_node/lib_dev/services.ml +++ b/etherlink/bin_node/lib_dev/services.ml @@ -40,7 +40,7 @@ let client_version = "%s/%s-%s/%s/ocamlc.%s" "octez-evm-node" (Tezos_version.Version.to_string - Tezos_version_value.Current_git_info.version) + Tezos_version_value.Current_git_info.octez_version) Tezos_version_value.Current_git_info.abbreviated_commit_hash Stdlib.Sys.os_type Stdlib.Sys.ocaml_version diff --git a/etherlink/bin_node/lib_prod/services.ml b/etherlink/bin_node/lib_prod/services.ml index 6d0dff8e5ce3..467b2894d614 100644 --- a/etherlink/bin_node/lib_prod/services.ml +++ b/etherlink/bin_node/lib_prod/services.ml @@ -40,7 +40,7 @@ let client_version = "%s/%s-%s/%s/ocamlc.%s" "octez-evm-node" (Tezos_version.Version.to_string - Tezos_version_value.Current_git_info.version) + Tezos_version_value.Current_git_info.octez_version) Tezos_version_value.Current_git_info.abbreviated_commit_hash Stdlib.Sys.os_type Stdlib.Sys.ocaml_version diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml index b5077a6858e3..2c3c45fe3c43 100644 --- a/etherlink/bin_node/main.ml +++ b/etherlink/bin_node/main.ml @@ -1243,7 +1243,7 @@ let dispatch args = let handle_error = function | Ok _ -> () | Error [Tezos_clic.Version] -> - let devmode = Tezos_version_value.Bin_version.version_string in + let devmode = Tezos_version_value.Bin_version.octez_version_string in Format.printf "%s\n" devmode ; exit 0 | Error [Tezos_clic.Help command] -> diff --git a/src/bin_codec/codec.ml b/src/bin_codec/codec.ml index 387f1678f449..d7cd272ba99f 100644 --- a/src/bin_codec/codec.ml +++ b/src/bin_codec/codec.ml @@ -169,7 +169,9 @@ let main commands = match r with | Ok () -> Lwt.return 0 | Error [Tezos_clic.Version] -> - let version = Tezos_version_value.Bin_version.version_string in + let version = + Tezos_version_value.Bin_version.octez_version_string + in Format.printf "%s\n" version ; Lwt.return 0 | Error [Tezos_clic.Help command] -> diff --git a/src/bin_dal_node/cli.ml b/src/bin_dal_node/cli.ml index eb50d49010ec..b4dbdca6b867 100644 --- a/src/bin_dal_node/cli.ml +++ b/src/bin_dal_node/cli.ml @@ -245,7 +245,7 @@ module Run = struct let man = description let info = - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Cmdliner.Cmd.info ~doc:"Run the Octez DAL node" ~man ~version "run" let cmd run = Cmdliner.Cmd.v info (Term.term run) @@ -276,7 +276,7 @@ module Config = struct ] let info = - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Cmdliner.Cmd.info ~doc:"Configuration initialisation" ~man ~version "init" let cmd run = Cmdliner.Cmd.v info (Term.term run) @@ -285,7 +285,7 @@ module Config = struct let cmd run = let default = Cmdliner.Term.(ret (const (`Help (`Pager, None)))) in let info = - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Cmdliner.Cmd.info ~doc:"Manage the Octez DAL node configuration" ~man @@ -338,7 +338,7 @@ let make ~run = in let default = Cmdliner.Term.(ret (const (`Help (`Pager, None)))) in let info = - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Cmdliner.Cmd.info ~doc:"The Octez DAL node" ~version "octez-dal-node" in Cmdliner.Cmd.group diff --git a/src/bin_node/main.ml b/src/bin_node/main.ml index 70e3ef149fcc..4e97b095a52d 100644 --- a/src/bin_node/main.ml +++ b/src/bin_node/main.ml @@ -96,7 +96,7 @@ let () = try Octez_protocol_compiler.Compiler.main Octez_protocol_compiler_native.Native.driver - Tezos_version_value.Bin_version.version_string ; + Tezos_version_value.Bin_version.octez_version_string ; Stdlib.exit 0 with exn -> Format.eprintf "%a\n%!" Opterrors.report_error exn ; @@ -131,7 +131,7 @@ let description = let man = description @ Node_run_command.Manpage.examples let info = - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Cmdliner.Cmd.info ~doc:"The Octez node" ~man ~version "octez-node" module Node_metrics_command = struct diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml index b48ed2ad0b69..1668e4b1fdba 100644 --- a/src/bin_node/node_run_command.ml +++ b/src/bin_node/node_run_command.ml @@ -336,7 +336,8 @@ let init_node ?sandbox ?target ~identity ~singleprocess ~internal_events | _ -> return_unit in let version = - Tezos_version.Version.to_string Tezos_version_value.Current_git_info.version + Tezos_version.Version.to_string + Tezos_version_value.Current_git_info.octez_version in let commit_info = ({ @@ -696,7 +697,7 @@ let run ?verbosity ?sandbox ?target ?(cli_warnings = []) let*! () = Event.(emit starting_node) ( config.blockchain_network.chain_name, - Tezos_version_value.Current_git_info.version, + Tezos_version_value.Current_git_info.octez_version, Tezos_version_value.Current_git_info.abbreviated_commit_hash ) in let*! () = init_zcash () in diff --git a/src/bin_proxy_server/main_proxy_server.ml b/src/bin_proxy_server/main_proxy_server.ml index c348da09cc76..128904cfcfb3 100644 --- a/src/bin_proxy_server/main_proxy_server.ml +++ b/src/bin_proxy_server/main_proxy_server.ml @@ -289,7 +289,7 @@ let info = `P "Report issues to https://gitlab.com/tezos/tezos/-/issues"; ] in - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Cmd.info name ~version ~doc ~exits:Cmd.Exit.defaults ~man let () = exit (Cmd.eval (Cmd.v info term)) diff --git a/src/bin_snoop/commands.ml b/src/bin_snoop/commands.ml index d08250a79470..2be4e647b0c3 100644 --- a/src/bin_snoop/commands.ml +++ b/src/bin_snoop/commands.ml @@ -1842,7 +1842,7 @@ let list_solvers, list_models = match result with | Ok global_options -> global_options | Error [Tezos_clic.Version] -> - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Format.printf "%s\n" version ; exit 0 | Error [Tezos_clic.Help command] -> diff --git a/src/lib_client_base_unix/client_main_run.ml b/src/lib_client_base_unix/client_main_run.ml index db1512244a32..32e905471a77 100644 --- a/src/lib_client_base_unix/client_main_run.ml +++ b/src/lib_client_base_unix/client_main_run.ml @@ -561,7 +561,9 @@ let main (module C : M) ~select_commands = match r with | Ok () -> Lwt.return 0 | Error [Tezos_clic.Version] -> - let version = Tezos_version_value.Bin_version.version_string in + let version = + Tezos_version_value.Bin_version.octez_version_string + in Format.printf "%s\n" version ; Lwt.return 0 | Error [Tezos_clic.Help command] -> diff --git a/src/lib_protocol_compiler/bin/main_native.ml b/src/lib_protocol_compiler/bin/main_native.ml index ca55cf897997..e2c532efa8f2 100644 --- a/src/lib_protocol_compiler/bin/main_native.ml +++ b/src/lib_protocol_compiler/bin/main_native.ml @@ -57,7 +57,7 @@ let () = try Octez_protocol_compiler.Compiler.main Octez_protocol_compiler_native.Native.driver - Tezos_version_value.Bin_version.version_string ; + Tezos_version_value.Bin_version.octez_version_string ; Stdlib.exit 0 with exn -> Format.eprintf "%a\n%!" Opterrors.report_error exn ; diff --git a/src/lib_shell/node.ml b/src/lib_shell/node.ml index ba7a05d91f38..7610e75ece06 100644 --- a/src/lib_shell/node.ml +++ b/src/lib_shell/node.ml @@ -82,7 +82,7 @@ let get_version node = } : Tezos_version.Node_version.commit_info) in - let version = Tezos_version_value.Current_git_info.version in + let version = Tezos_version_value.Current_git_info.octez_version in let network_version = P2p.announced_version node.p2p in Tezos_version.Node_version. {version; commit_info = Some commit_info; network_version} diff --git a/src/lib_smart_rollup_node/metrics.ml b/src/lib_smart_rollup_node/metrics.ml index 7cf53d7b9bc5..8a88fdf7efb8 100644 --- a/src/lib_smart_rollup_node/metrics.ml +++ b/src/lib_smart_rollup_node/metrics.ml @@ -159,7 +159,7 @@ module Info = struct () let () = - let version = Version.to_string Current_git_info.version in + let version = Version.to_string Current_git_info.octez_version in let commit_hash = Current_git_info.commit_hash in let commit_date = Current_git_info.committer_date in let _ = diff --git a/src/lib_smart_rollup_node/rpc_directory.ml b/src/lib_smart_rollup_node/rpc_directory.ml index 8eae818775f4..9de9402db18e 100644 --- a/src/lib_smart_rollup_node/rpc_directory.ml +++ b/src/lib_smart_rollup_node/rpc_directory.ml @@ -494,7 +494,7 @@ let generate_openapi dir proto = "Smart Rollup Node RPC API for protocol %a" Protocol_hash.pp proto) - Tezos_version_value.Bin_version.simple_version_string + Tezos_version_value.Bin_version.octez_simple_version_string |> Openapi.to_json |> return let () = diff --git a/src/lib_smart_rollup_node/store_migration.ml b/src/lib_smart_rollup_node/store_migration.ml index 3b35d927af92..4b6f3b0b9a33 100644 --- a/src/lib_smart_rollup_node/store_migration.ml +++ b/src/lib_smart_rollup_node/store_migration.ml @@ -272,7 +272,7 @@ module V1_migrations = struct Format.asprintf "Rollup node %a" Tezos_version_parser.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version in let message = "Migration store from v0 to v1" in Irmin_store.Raw_irmin.Info.v ~author ~message date diff --git a/src/lib_validation/command_line.ml b/src/lib_validation/command_line.ml index 74002afa7d0f..9bf509d17b2b 100644 --- a/src/lib_validation/command_line.ml +++ b/src/lib_validation/command_line.ml @@ -54,7 +54,7 @@ let parse_args () = (fun () -> Format.printf "%s\n" - Tezos_version_value.Bin_version.version_string ; + Tezos_version_value.Bin_version.octez_version_string ; Stdlib.exit 0), " Display version information" ); ] diff --git a/src/lib_wasm_debugger/wasm_debugger.ml b/src/lib_wasm_debugger/wasm_debugger.ml index 9f6572d01a00..81c27128ed52 100644 --- a/src/lib_wasm_debugger/wasm_debugger.ml +++ b/src/lib_wasm_debugger/wasm_debugger.ml @@ -429,7 +429,7 @@ module Make (Wasm : Wasm_utils_intf.S) = struct match result with | Ok _ -> () | Error [Tezos_clic.Version] -> - let version = Tezos_version_value.Bin_version.version_string in + let version = Tezos_version_value.Bin_version.octez_version_string in Format.printf "%s\n" version ; exit 0 | Error [Tezos_clic.Help command] -> diff --git a/src/proto_018_Proxford/lib_delegate/client_daemon.ml b/src/proto_018_Proxford/lib_delegate/client_daemon.ml index bca429764176..33a90e1977d3 100644 --- a/src/proto_018_Proxford/lib_delegate/client_daemon.ml +++ b/src/proto_018_Proxford/lib_delegate/client_daemon.ml @@ -120,7 +120,7 @@ module Baker = struct cctxt#message "Baker v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash @@ -152,7 +152,7 @@ module Accuser = struct cctxt#message "Accuser v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash @@ -194,7 +194,7 @@ module VDF = struct cctxt#message "VDF daemon v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash diff --git a/src/proto_019_PtParisA/lib_delegate/client_daemon.ml b/src/proto_019_PtParisA/lib_delegate/client_daemon.ml index 08b71842efb7..319e1264549f 100644 --- a/src/proto_019_PtParisA/lib_delegate/client_daemon.ml +++ b/src/proto_019_PtParisA/lib_delegate/client_daemon.ml @@ -120,7 +120,7 @@ module Baker = struct cctxt#message "Baker v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash @@ -158,7 +158,7 @@ module Accuser = struct cctxt#message "Accuser v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash @@ -200,7 +200,7 @@ module VDF = struct cctxt#message "VDF daemon v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash diff --git a/src/proto_alpha/lib_delegate/client_daemon.ml b/src/proto_alpha/lib_delegate/client_daemon.ml index 08b71842efb7..319e1264549f 100644 --- a/src/proto_alpha/lib_delegate/client_daemon.ml +++ b/src/proto_alpha/lib_delegate/client_daemon.ml @@ -120,7 +120,7 @@ module Baker = struct cctxt#message "Baker v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash @@ -158,7 +158,7 @@ module Accuser = struct cctxt#message "Accuser v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash @@ -200,7 +200,7 @@ module VDF = struct cctxt#message "VDF daemon v%a (%s) for %a started." Tezos_version.Version.pp - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short Protocol.hash -- GitLab From ae3cb490b9eb696c26fb93e54b5ab0cf4487110f Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 11 Mar 2024 19:23:36 +0100 Subject: [PATCH 7/9] Tests: Fix version tests --- scripts/test_octez_release_version.sh | 14 +++---- src/lib_version/test/test_parser.ml | 55 +++++++++++++++++++++------ 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/scripts/test_octez_release_version.sh b/scripts/test_octez_release_version.sh index cca0cd51e030..6042898b835e 100755 --- a/scripts/test_octez_release_version.sh +++ b/scripts/test_octez_release_version.sh @@ -41,25 +41,25 @@ cleanup git checkout -b "$TESTBRANCH" git tag "octez-$VERSION" -m "test" -test_version "$VERSION" "$VERSION" +test_version "Octez $VERSION" "$VERSION" git tag "octez-v$VERSION" -m "test" -test_version "$VERSION" "octez-v$VERSION" +test_version "Octez $VERSION" "octez-v$VERSION" git commit --allow-empty -m "test" > /dev/null 2>&1 -test_version "$VERSION+dev" "$(git describe --tags)" +test_version "Octez $VERSION+dev" "$(git describe --tags)" git tag "$RANDOMTAG" -m "test" -test_version "0.0+dev" "$RANDOMTAG" +test_version "Octez 0.0+dev" "$RANDOMTAG" git tag "octez-v$VERSION+rc1" -m "test" -test_version "$VERSION+dev" "octez-v$VERSION+rc1" +test_version "Octez $VERSION+dev" "octez-v$VERSION+rc1" git tag "octez-v$VERSION-rc1" -m "test" -test_version "$VERSION~rc1" "octez-v$VERSION-rc1" +test_version "Octez $VERSION~rc1" "octez-v$VERSION-rc1" git commit --allow-empty -m "test" > /dev/null 2>&1 -test_version "$VERSION~rc1+dev" "$(git describe --tags)" +test_version "Octez $VERSION~rc1+dev" "$(git describe --tags)" git checkout - diff --git a/src/lib_version/test/test_parser.ml b/src/lib_version/test/test_parser.ml index 38191a3e6d6f..1f621d2d8657 100644 --- a/src/lib_version/test/test_parser.ml +++ b/src/lib_version/test/test_parser.ml @@ -41,18 +41,49 @@ module Assert = struct if not (eq x y) then fail (prn x) (prn y) msg end -let legal_versions = +let octez_legal_versions = [ - ("octez-10.93", {Version.major = 10; minor = 93; additional_info = Release}); - ("octez-v10.93", {Version.major = 10; minor = 93; additional_info = Release}); - ("octez-10.93+dev", {Version.major = 10; minor = 93; additional_info = Dev}); - ("octez-10.93-rc1", {Version.major = 10; minor = 93; additional_info = RC 1}); + ( "octez-10.93", + { + product = Octez; + Version.major = 10; + minor = 93; + additional_info = Release; + } ); + ( "octez-v10.93", + { + product = Octez; + Version.major = 10; + minor = 93; + additional_info = Release; + } ); + ( "octez-10.93+dev", + {product = Octez; Version.major = 10; minor = 93; additional_info = Dev} + ); + ( "octez-10.93-rc1", + {product = Octez; Version.major = 10; minor = 93; additional_info = RC 1} + ); ( "octez-10.93-rc1+dev", - {Version.major = 10; minor = 93; additional_info = RC_dev 1} ); + { + product = Octez; + Version.major = 10; + minor = 93; + additional_info = RC_dev 1; + } ); ( "octez-10.93-beta1", - {Version.major = 10; minor = 93; additional_info = Beta 1} ); + { + product = Octez; + Version.major = 10; + minor = 93; + additional_info = Beta 1; + } ); ( "octez-10.93-beta1+dev", - {Version.major = 10; minor = 93; additional_info = Beta_dev 1} ); + { + product = Octez; + Version.major = 10; + minor = 93; + additional_info = Beta_dev 1; + } ); ] let parse_version s = Tezos_version_parser.version_tag (Lexing.from_string s) @@ -81,10 +112,10 @@ let prn = function Format.asprintf "%a" Tezos_version_parser.pp Tezos_version_parser.default | Some v -> Format.asprintf "%a" Tezos_version_parser.pp v -let test_parser _ = - ListLabels.iter legal_versions ~f:(fun (x, e) -> +let test_octez_parser _ = + ListLabels.iter octez_legal_versions ~f:(fun (x, e) -> Assert.equal - ~msg:(Format.asprintf "testing version string: \"%s\"" x) + ~msg:(Format.asprintf "testing Octez version string: \"%s\"" x) ~eq ~prn (Some e) @@ -94,4 +125,4 @@ let () = Alcotest.run ~__FILE__ "version" - [("parser", [("versions", `Quick, test_parser)])] + [("parser", [("octez versions", `Quick, test_octez_parser)])] -- GitLab From b28e69007167d2060eb20b18b30b0a63ef02f354 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 11 Mar 2024 23:59:33 +0100 Subject: [PATCH 8/9] Version: Rename node_version to octez_node_version --- docs/doc_gen/node_helpers.ml | 2 +- src/bin_node/node_run_command.ml | 8 ++++---- src/lib_p2p/p2p_metrics.ml | 2 +- src/lib_p2p/p2p_metrics_collectors.ml | 2 +- src/lib_rpc_process/directory.mli | 2 +- src/lib_rpc_process/parameters.ml | 4 ++-- src/lib_rpc_process/parameters.mli | 2 +- src/lib_rpc_process/rpc_process_worker.mli | 2 +- src/lib_shell/monitor_directory.ml | 4 ++-- src/lib_shell/monitor_directory.mli | 2 +- src/lib_shell/node.ml | 4 ++-- src/lib_shell/node.mli | 8 ++++---- src/lib_shell/shell_metrics.ml | 5 +++-- src/lib_shell/shell_metrics.mli | 2 +- src/lib_shell/test/test_node.ml | 6 +++--- src/lib_shell/version_directory.ml | 5 +++-- src/lib_shell_services/version_services.ml | 2 +- src/lib_shell_services/version_services.mli | 10 ++++++++-- src/lib_smart_rollup_node/metrics.ml | 2 +- src/lib_store/unix/store_metrics.ml | 2 +- .../{node_version.ml => octez_node_version.ml} | 8 +++++--- .../{node_version.mli => octez_node_version.mli} | 3 ++- 22 files changed, 49 insertions(+), 38 deletions(-) rename src/lib_version/{node_version.ml => octez_node_version.ml} (92%) rename src/lib_version/{node_version.mli => octez_node_version.mli} (94%) diff --git a/docs/doc_gen/node_helpers.ml b/docs/doc_gen/node_helpers.ml index 7d916bdc37a9..672d220c6bb8 100644 --- a/docs/doc_gen/node_helpers.ml +++ b/docs/doc_gen/node_helpers.ml @@ -69,7 +69,7 @@ let with_node f = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let* node = Node.create diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml index 1668e4b1fdba..2066b5f98d87 100644 --- a/src/bin_node/node_run_command.ml +++ b/src/bin_node/node_run_command.ml @@ -138,7 +138,7 @@ module Event = struct ~level:Notice ("chain", Distributed_db_version.Name.encoding) ~pp2:Tezos_version.Version.pp - ("version", Tezos_version.Node_version.version_encoding) + ("version", Tezos_version.Octez_node_version.version_encoding) ("git_info", Data_encoding.string) let node_is_ready = @@ -344,7 +344,7 @@ let init_node ?sandbox ?target ~identity ~singleprocess ~internal_events commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in Node.create ~sandboxed:(sandbox <> None) @@ -363,7 +363,7 @@ let rpc_metrics = Prometheus.Summary.v_labels ~label_names:["endpoint"; "method"] ~help:"RPC endpoint call counts and sum of execution times." - ~namespace:Tezos_version.Node_version.namespace + ~namespace:Tezos_version.Octez_node_version.namespace ~subsystem:"rpc" "calls" @@ -633,7 +633,7 @@ let init_rpc (config : Config_file.t) (node : Node.t) internal_events = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let node_version = Node.get_version node in diff --git a/src/lib_p2p/p2p_metrics.ml b/src/lib_p2p/p2p_metrics.ml index b6c3dd88e234..20b11d5e7e8b 100644 --- a/src/lib_p2p/p2p_metrics.ml +++ b/src/lib_p2p/p2p_metrics.ml @@ -23,7 +23,7 @@ (* *) (*****************************************************************************) -let namespace = Tezos_version.Node_version.namespace +let namespace = Tezos_version.Octez_node_version.namespace let subsystem = "p2p" diff --git a/src/lib_p2p/p2p_metrics_collectors.ml b/src/lib_p2p/p2p_metrics_collectors.ml index 927ea7f8aad0..3ca8376efc04 100644 --- a/src/lib_p2p/p2p_metrics_collectors.ml +++ b/src/lib_p2p/p2p_metrics_collectors.ml @@ -23,7 +23,7 @@ (* *) (*****************************************************************************) -let namespace = Tezos_version.Node_version.namespace +let namespace = Tezos_version.Octez_node_version.namespace let subsystem = "p2p" diff --git a/src/lib_rpc_process/directory.mli b/src/lib_rpc_process/directory.mli index 5eb62d0f40ec..ee21ec7c5f3c 100644 --- a/src/lib_rpc_process/directory.mli +++ b/src/lib_rpc_process/directory.mli @@ -9,6 +9,6 @@ the rpc process. RPCs handled here are not forwarded to the node. *) val build_rpc_directory : - Tezos_version.Node_version.t -> + Tezos_version.Octez_node_version.t -> Octez_node_config.Config_file.t -> unit Tezos_rpc.Directory.t diff --git a/src/lib_rpc_process/parameters.ml b/src/lib_rpc_process/parameters.ml index e4d66a582fa0..aeef0b5b25c6 100644 --- a/src/lib_rpc_process/parameters.ml +++ b/src/lib_rpc_process/parameters.ml @@ -27,7 +27,7 @@ type t = { config : Config_file.t; rpc_comm_socket_path : string; internal_events : Tezos_base.Internal_event_config.t; - node_version : Tezos_version.Node_version.t; + node_version : Tezos_version.Octez_node_version.t; } let parameters_encoding = @@ -41,4 +41,4 @@ let parameters_encoding = (req "config" Config_file.encoding) (req "rpc_comm_socket_path" Data_encoding.string) (req "internal_events" Tezos_base.Internal_event_config.encoding) - (req "node_version" Tezos_version.Node_version.encoding)) + (req "node_version" Tezos_version.Octez_node_version.encoding)) diff --git a/src/lib_rpc_process/parameters.mli b/src/lib_rpc_process/parameters.mli index 06f27b34e056..2ed84390f8ba 100644 --- a/src/lib_rpc_process/parameters.mli +++ b/src/lib_rpc_process/parameters.mli @@ -28,7 +28,7 @@ type t = { config : Config_file.t; rpc_comm_socket_path : string; internal_events : Tezos_base.Internal_event_config.t; - node_version : Tezos_version.Node_version.t; + node_version : Tezos_version.Octez_node_version.t; } (** Encoding for parameters type {!t} *) diff --git a/src/lib_rpc_process/rpc_process_worker.mli b/src/lib_rpc_process/rpc_process_worker.mli index 8b3249334f22..b08cc578ffed 100644 --- a/src/lib_rpc_process/rpc_process_worker.mli +++ b/src/lib_rpc_process/rpc_process_worker.mli @@ -42,7 +42,7 @@ type t val create : comm_socket_path:string -> Config_file.t -> - Tezos_version.Node_version.t -> + Tezos_version.Octez_node_version.t -> Internal_event_config.t -> t diff --git a/src/lib_shell/monitor_directory.ml b/src/lib_shell/monitor_directory.ml index 48410e57c255..a7c983fda6d1 100644 --- a/src/lib_shell/monitor_directory.ml +++ b/src/lib_shell/monitor_directory.ml @@ -24,8 +24,8 @@ (* *) (*****************************************************************************) -let build_rpc_directory ~(commit_info : Node_version.commit_info) validator - mainchain_validator = +let build_rpc_directory ~(commit_info : Octez_node_version.commit_info) + validator mainchain_validator = let open Lwt_syntax in let distributed_db = Validator.distributed_db validator in let store = Distributed_db.store distributed_db in diff --git a/src/lib_shell/monitor_directory.mli b/src/lib_shell/monitor_directory.mli index 193084787762..450c3ca6b1bb 100644 --- a/src/lib_shell/monitor_directory.mli +++ b/src/lib_shell/monitor_directory.mli @@ -24,7 +24,7 @@ (*****************************************************************************) val build_rpc_directory : - commit_info:Node_version.commit_info -> + commit_info:Octez_node_version.commit_info -> Validator.t -> Chain_validator.t -> unit Tezos_rpc.Directory.t diff --git a/src/lib_shell/node.ml b/src/lib_shell/node.ml index 7610e75ece06..316a92d6e494 100644 --- a/src/lib_shell/node.ml +++ b/src/lib_shell/node.ml @@ -80,11 +80,11 @@ let get_version node = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let version = Tezos_version_value.Current_git_info.octez_version in let network_version = P2p.announced_version node.p2p in - Tezos_version.Node_version. + Tezos_version.Octez_node_version. {version; commit_info = Some commit_info; network_version} let peer_metadata_cfg : _ P2p_params.peer_meta_config = diff --git a/src/lib_shell/node.mli b/src/lib_shell/node.mli index 0bb0a889c6ba..4a2f46366478 100644 --- a/src/lib_shell/node.mli +++ b/src/lib_shell/node.mli @@ -26,7 +26,7 @@ type t -val get_version : t -> Tezos_version.Node_version.t +val get_version : t -> Tezos_version.Octez_node_version.t type config = { genesis : Genesis.t; @@ -58,7 +58,7 @@ val create : ?sandbox_parameters:Data_encoding.json -> singleprocess:bool -> version:string -> - commit_info:Node_version.commit_info -> + commit_info:Octez_node_version.commit_info -> config -> Shell_limits.peer_validator_limits -> Shell_limits.block_validator_limits -> @@ -74,7 +74,7 @@ val shutdown : t -> unit Lwt.t [commit_info] and [node] contain all informations required to build such a directory. *) val build_rpc_directory : - node_version:Tezos_version.Node_version.t -> - commit_info:Node_version.commit_info -> + node_version:Tezos_version.Octez_node_version.t -> + commit_info:Octez_node_version.commit_info -> t -> unit Tezos_rpc.Directory.t diff --git a/src/lib_shell/shell_metrics.ml b/src/lib_shell/shell_metrics.ml index f927b9ab21cd..68d9fb9209c1 100644 --- a/src/lib_shell/shell_metrics.ml +++ b/src/lib_shell/shell_metrics.ml @@ -23,7 +23,7 @@ (* *) (*****************************************************************************) -let namespace = Tezos_version.Node_version.namespace +let namespace = Tezos_version.Octez_node_version.namespace module Worker = struct open Prometheus @@ -707,7 +707,8 @@ module Version = struct ] let init ~version - ~commit_info:({commit_hash; commit_date} : Node_version.commit_info) net = + ~commit_info:({commit_hash; commit_date} : Octez_node_version.commit_info) + net = let _ = Prometheus.Gauge.labels metric @@ [version] @ network_version net @ [commit_hash; commit_date] diff --git a/src/lib_shell/shell_metrics.mli b/src/lib_shell/shell_metrics.mli index 3bbd08ec7a48..e94daab128b4 100644 --- a/src/lib_shell/shell_metrics.mli +++ b/src/lib_shell/shell_metrics.mli @@ -137,7 +137,7 @@ end module Version : sig val init : version:string -> - commit_info:Node_version.commit_info -> + commit_info:Octez_node_version.commit_info -> ('a, 'b, 'c) P2p.t -> unit end diff --git a/src/lib_shell/test/test_node.ml b/src/lib_shell/test/test_node.ml index c05d50659a2c..19f93f969f88 100644 --- a/src/lib_shell/test/test_node.ml +++ b/src/lib_shell/test/test_node.ml @@ -120,7 +120,7 @@ let node_sandbox_initialization_events sandbox_parameters config _switch () = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let*?? n = Node.create @@ -168,7 +168,7 @@ let node_initialization_events _sandbox_parameters config _switch () = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let*?? n = Node.create @@ -221,7 +221,7 @@ let node_store_known_protocol_events _sandbox_parameters config _switch () = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let*?? n = Node.create diff --git a/src/lib_shell/version_directory.ml b/src/lib_shell/version_directory.ml index 12598b4bb02d..03efd9418ea6 100644 --- a/src/lib_shell/version_directory.ml +++ b/src/lib_shell/version_directory.ml @@ -22,9 +22,10 @@ (* *) (*****************************************************************************) -let rpc_directory (node_version : Node_version.t) = +let rpc_directory (node_version : Octez_node_version.t) = let dir = Tezos_rpc.Directory.empty in Tezos_rpc.Directory.gen_register dir Version_services.S.version - (fun () () () -> Tezos_rpc.Answer.return @@ (node_version : Node_version.t)) + (fun () () () -> + Tezos_rpc.Answer.return @@ (node_version : Octez_node_version.t)) diff --git a/src/lib_shell_services/version_services.ml b/src/lib_shell_services/version_services.ml index f1b81788ff76..d12e6f2e9784 100644 --- a/src/lib_shell_services/version_services.ml +++ b/src/lib_shell_services/version_services.ml @@ -27,7 +27,7 @@ module S = struct Tezos_rpc.Service.get_service ~description:"Get information on the node version" ~query:Tezos_rpc.Query.empty - ~output:Node_version.encoding + ~output:Octez_node_version.encoding Tezos_rpc.Path.(root / "version") end diff --git a/src/lib_shell_services/version_services.mli b/src/lib_shell_services/version_services.mli index 8b4f8540c197..5eb38c25020c 100644 --- a/src/lib_shell_services/version_services.mli +++ b/src/lib_shell_services/version_services.mli @@ -24,8 +24,14 @@ module S : sig val version : - ([`GET], unit, unit, unit, unit, Node_version.t) Tezos_rpc.Service.service + ( [`GET], + unit, + unit, + unit, + unit, + Octez_node_version.t ) + Tezos_rpc.Service.service end val version : - #Tezos_rpc.Context.simple -> Node_version.t Error_monad.tzresult Lwt.t + #Tezos_rpc.Context.simple -> Octez_node_version.t Error_monad.tzresult Lwt.t diff --git a/src/lib_smart_rollup_node/metrics.ml b/src/lib_smart_rollup_node/metrics.ml index 8a88fdf7efb8..f29eb4518e1c 100644 --- a/src/lib_smart_rollup_node/metrics.ml +++ b/src/lib_smart_rollup_node/metrics.ml @@ -27,7 +27,7 @@ open Prometheus let sc_rollup_node_registry = CollectorRegistry.create () -let namespace = Tezos_version.Node_version.namespace +let namespace = Tezos_version.Octez_node_version.namespace let subsystem = "sc_rollup_node" diff --git a/src/lib_store/unix/store_metrics.ml b/src/lib_store/unix/store_metrics.ml index ef2d2de7cb05..f1247e4614d5 100644 --- a/src/lib_store/unix/store_metrics.ml +++ b/src/lib_store/unix/store_metrics.ml @@ -32,7 +32,7 @@ type metrics = { last_store_merge_time : Prometheus.Gauge.t; } -let namespace = Tezos_version.Node_version.namespace +let namespace = Tezos_version.Octez_node_version.namespace type collectors = {mutable invalid_blocks : unit -> float Lwt.t} diff --git a/src/lib_version/node_version.ml b/src/lib_version/octez_node_version.ml similarity index 92% rename from src/lib_version/node_version.ml rename to src/lib_version/octez_node_version.ml index 3499b84134f3..79828bca5c11 100644 --- a/src/lib_version/node_version.ml +++ b/src/lib_version/octez_node_version.ml @@ -1,6 +1,7 @@ (*****************************************************************************) +(* *) (* Open Source License *) -(* Copyright (c) 2020 Nomadic Labs, *) +(* Copyright (c) 2020-2024 Nomadic Labs, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -76,9 +77,10 @@ let additional_info_encoding = let version_encoding = let open Data_encoding in conv - (fun ({major; minor; additional_info} : Version.t) -> + (fun ({product = _; major; minor; additional_info} : Version.t) -> (major, minor, additional_info)) - (fun (major, minor, additional_info) -> {major; minor; additional_info}) + (fun (major, minor, additional_info) -> + {product = Octez; major; minor; additional_info}) (obj3 (req "major" int31) (req "minor" int31) diff --git a/src/lib_version/node_version.mli b/src/lib_version/octez_node_version.mli similarity index 94% rename from src/lib_version/node_version.mli rename to src/lib_version/octez_node_version.mli index 02fbe667cd78..173e1a7c7455 100644 --- a/src/lib_version/node_version.mli +++ b/src/lib_version/octez_node_version.mli @@ -1,6 +1,7 @@ (*****************************************************************************) +(* *) (* Open Source License *) -(* Copyright (c) 2020 Nomadic Labs, *) +(* Copyright (c) 2020-2024 Nomadic Labs, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) -- GitLab From 0b84dab02143b22948de6e800b50ca97c129eb3f Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 12 Mar 2024 00:16:23 +0100 Subject: [PATCH 9/9] Docs: Use octez_version --- docs/doc_gen/node_helpers.ml | 2 +- docs/doc_gen/rpc_doc.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/doc_gen/node_helpers.ml b/docs/doc_gen/node_helpers.ml index 672d220c6bb8..0ec233856f1f 100644 --- a/docs/doc_gen/node_helpers.ml +++ b/docs/doc_gen/node_helpers.ml @@ -62,7 +62,7 @@ let with_node f = in let version = Tezos_version.Version.to_string - Tezos_version_value.Current_git_info.version + Tezos_version_value.Current_git_info.octez_version in let commit_info = ({ diff --git a/docs/doc_gen/rpc_doc.ml b/docs/doc_gen/rpc_doc.ml index c859b191fa74..947f08021383 100644 --- a/docs/doc_gen/rpc_doc.ml +++ b/docs/doc_gen/rpc_doc.ml @@ -358,7 +358,7 @@ let make_index_shell ?introduction_path node = commit_hash = Tezos_version_value.Current_git_info.commit_hash; commit_date = Tezos_version_value.Current_git_info.committer_date; } - : Tezos_version.Node_version.commit_info) + : Tezos_version.Octez_node_version.commit_info) in let node_version = Node.get_version node in let shell_dir = Node.build_rpc_directory ~node_version ~commit_info node in -- GitLab