From 9b3f917d586822ec3b9f10cd8c170709c9d8a09f Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 21 Jun 2023 11:12:30 +0200 Subject: [PATCH 1/4] proto_alpha/lib_client: remove unused bad_endorsement_delay error --- src/proto_alpha/lib_client/client_proto_args.ml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/proto_alpha/lib_client/client_proto_args.ml b/src/proto_alpha/lib_client/client_proto_args.ml index 136dd251a542..ba842d3288d1 100644 --- a/src/proto_alpha/lib_client/client_proto_args.ml +++ b/src/proto_alpha/lib_client/client_proto_args.ml @@ -36,8 +36,6 @@ type error += Bad_minimal_fees of string type error += Bad_max_waiting_time of string -type error += Bad_endorsement_delay of string - type error += Bad_preserved_levels of string type error += Forbidden_Negative_int of string @@ -93,20 +91,6 @@ let () = Data_encoding.(obj1 (req "parameter" string)) (function Bad_max_waiting_time parameter -> Some parameter | _ -> None) (fun parameter -> Bad_max_waiting_time parameter) ; - register_error_kind - `Permanent - ~id:"badEndorsementDelayArg" - ~title:"Bad -endorsement-delay arg" - ~description:"invalid duration in -endorsement-delay" - ~pp:(fun ppf literal -> - Format.fprintf - ppf - "Bad argument value for -endorsement-delay. Expected an integer, but \ - given '%s'" - literal) - Data_encoding.(obj1 (req "parameter" string)) - (function Bad_endorsement_delay parameter -> Some parameter | _ -> None) - (fun parameter -> Bad_endorsement_delay parameter) ; register_error_kind `Permanent ~id:"badPreservedLevelsArg" -- GitLab From a53098d02868a3164684c4f9f0b7097dea78a806 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 21 Jun 2023 11:13:02 +0200 Subject: [PATCH 2/4] proto_alpha/lib_client: remove unused arguments switch --- .../lib_client/client_proto_args.ml | 25 ------------------- .../lib_client/client_proto_args.mli | 10 -------- 2 files changed, 35 deletions(-) diff --git a/src/proto_alpha/lib_client/client_proto_args.ml b/src/proto_alpha/lib_client/client_proto_args.ml index ba842d3288d1..92718c09b9c3 100644 --- a/src/proto_alpha/lib_client/client_proto_args.ml +++ b/src/proto_alpha/lib_client/client_proto_args.ml @@ -323,12 +323,6 @@ let force_switch = of block without a fitness greater than the current head." () -let no_endorse_switch = - Tezos_clic.switch - ~long:"no-endorse" - ~doc:"Do not let the client automatically endorse a block that it baked." - () - let minimal_timestamp_switch = Tezos_clic.switch ~long:"minimal-timestamp" @@ -683,25 +677,6 @@ let display_names_flag = ~doc:"Print names of scripts passed to this command" () -module Daemon = struct - let baking_switch = - Tezos_clic.switch ~long:"baking" ~short:'B' ~doc:"run the baking daemon" () - - let endorsement_switch = - Tezos_clic.switch - ~long:"endorsement" - ~short:'E' - ~doc:"run the endorsement daemon" - () - - let denunciation_switch = - Tezos_clic.switch - ~long:"denunciation" - ~short:'D' - ~doc:"run the denunciation daemon" - () -end - module Sc_rollup_params = struct let rollup_kind_parameter = Tezos_clic.parameter (fun (cctxt : #Client_context.full) name -> diff --git a/src/proto_alpha/lib_client/client_proto_args.mli b/src/proto_alpha/lib_client/client_proto_args.mli index ecf5cee4147b..5c588c70a111 100644 --- a/src/proto_alpha/lib_client/client_proto_args.mli +++ b/src/proto_alpha/lib_client/client_proto_args.mli @@ -76,8 +76,6 @@ val successor_level_arg : (bool, full) Tezos_clic.arg val force_switch : (bool, full) Tezos_clic.arg -val no_endorse_switch : (bool, full) Tezos_clic.arg - val minimal_timestamp_switch : (bool, full) Tezos_clic.arg val preserved_levels_arg : (int, full) Tezos_clic.arg @@ -121,14 +119,6 @@ val global_constant_param : val signature_parameter : (Signature.t, full) Tezos_clic.parameter -module Daemon : sig - val baking_switch : (bool, full) Tezos_clic.arg - - val endorsement_switch : (bool, full) Tezos_clic.arg - - val denunciation_switch : (bool, full) Tezos_clic.arg -end - val int_parameter : (int, full) Tezos_clic.parameter val z_parameter : (Z.t, full) Tezos_clic.parameter -- GitLab From aa20ce77ec16e4bb6cc25753740dc40f8583fb72 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 21 Jun 2023 11:14:14 +0200 Subject: [PATCH 3/4] proto_alpha/lib_client: rename attestation in operation results pretty printer --- src/proto_alpha/lib_client/operation_result.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index 42170555aea8..169968b89c24 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -345,7 +345,7 @@ let pp_balance_updates ppf balance_updates = Cycle.pp cycle | Nonce_revelation_rewards -> "nonce revelation rewards" - | Endorsing_rewards -> "endorsing rewards" + | Endorsing_rewards -> "attesting rewards" | Baking_rewards -> "baking rewards" | Baking_bonuses -> "baking bonuses" | Storage_fees -> "storage fees" @@ -358,7 +358,7 @@ let pp_balance_updates ppf balance_updates = | true, false -> ",participation" | true, true -> ",participation,revelation" in - Format.asprintf "lost endorsing rewards(%a%s)" pp_baker pkh reason + Format.asprintf "lost attesting rewards(%a%s)" pp_baker pkh reason | Liquidity_baking_subsidies -> "liquidity baking subsidies" | Burned -> "burned" | Commitments bpkh -> @@ -893,7 +893,7 @@ let pp_contents_and_result : {balance_updates; delegate; consensus_key; consensus_power} ) -> Format.fprintf ppf - "@[Endorsement:@,\ + "@[Attestation:@,\ Level: %a@,\ Balance updates:%a@,\ Delegate: %a@,\ @@ -915,7 +915,7 @@ let pp_contents_and_result : Double_endorsement_evidence_result bus ) -> Format.fprintf ppf - "@[Double endorsement evidence:@,\ + "@[Double attestation evidence:@,\ Exhibit A: %a@,\ Exhibit B: %a@,\ Balance updates:@,\ @@ -930,7 +930,7 @@ let pp_contents_and_result : Double_preendorsement_evidence_result bus ) -> Format.fprintf ppf - "@[Double preendorsement evidence:@,\ + "@[Double preattestation evidence:@,\ Exhibit A: %a@,\ Exhibit B: %a@,\ Balance updates:@,\ -- GitLab From 92e17caade32deb411854d05584d0a71c392b49a Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Tue, 11 Jul 2023 10:12:06 +0200 Subject: [PATCH 4/4] changelog: add entry for client receipt renaming --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index b0fe5bdbe03f..f0fa54bfdd23 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -214,6 +214,11 @@ Client - The ``typecheck script`` command can now be used to typecheck several scripts. +- From protocol ``alpha`` operation receipt output ``attestation`` instead of + ``endorsement``. For example ``double preendorsement evidence`` become + ``double preattesation evidence``, ``lost endorsing rewards`` become ``lost + attesting rewards``. (MR :gl:`!9232`) + Baker ----- -- GitLab