diff --git a/CHANGES.rst b/CHANGES.rst index b0fe5bdbe03ff30d63ad2196d6f71d13493dcf73..f0fa54bfdd2384f5a34e61c68c6bf2f539b5c04b 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 ----- diff --git a/src/proto_alpha/lib_client/client_proto_args.ml b/src/proto_alpha/lib_client/client_proto_args.ml index 136dd251a542df6735c5e954dbd77fa500c60352..92718c09b9c3202c254f24c06b4df0e317fba0b6 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" @@ -339,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" @@ -699,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 ecf5cee4147bc1cf4c888d11829f529137563399..5c588c70a11157affefb86d35d01a0663ee21540 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 diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index 42170555aea827550c15b1d0333b5028dc8e2f3a..169968b89c2442442cd54db218c85afd43d197be 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:@,\