From e09495bd97080f75c2455aaf087fe7240e86d0e0 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 30 Jun 2023 18:23:18 +0200 Subject: [PATCH 1/8] alpha: rename Preendorsement_consensus_kind --- src/proto_alpha/lib_protocol/alpha_context.mli | 8 ++++---- src/proto_alpha/lib_protocol/operation_repr.ml | 8 ++++---- src/proto_alpha/lib_protocol/operation_repr.mli | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index f5e2274213fb..805c282c9791 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -3999,15 +3999,15 @@ end (** This module re-exports definitions from {!Operation_repr.Kind}. *) module Kind : sig - type preendorsement_consensus_kind = Preendorsement_consensus_kind + type preattestation_consensus_kind = Preattestation_consensus_kind type endorsement_consensus_kind = Endorsement_consensus_kind type 'a consensus = - | Preendorsement_kind : preendorsement_consensus_kind consensus + | Preendorsement_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus - type preendorsement = preendorsement_consensus_kind consensus + type preendorsement = preattestation_consensus_kind consensus type endorsement = endorsement_consensus_kind consensus @@ -4024,7 +4024,7 @@ module Kind : sig endorsement_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = - preendorsement_consensus_kind double_consensus_operation_evidence + preattestation_consensus_kind double_consensus_operation_evidence type double_baking_evidence = Double_baking_evidence_kind diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 9a53e929989a..9531d3c7fbb3 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -27,15 +27,15 @@ (* Tezos Protocol Implementation - Low level Repr. of Operations *) module Kind = struct - type preendorsement_consensus_kind = Preendorsement_consensus_kind + type preattestation_consensus_kind = Preattestation_consensus_kind type endorsement_consensus_kind = Endorsement_consensus_kind type 'a consensus = - | Preendorsement_kind : preendorsement_consensus_kind consensus + | Preendorsement_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus - type preendorsement = preendorsement_consensus_kind consensus + type preendorsement = preattestation_consensus_kind consensus type endorsement = endorsement_consensus_kind consensus @@ -52,7 +52,7 @@ module Kind = struct endorsement_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = - preendorsement_consensus_kind double_consensus_operation_evidence + preattestation_consensus_kind double_consensus_operation_evidence type double_baking_evidence = Double_baking_evidence_kind diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 56d827f7eb79..316b213018be 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -61,15 +61,15 @@ list. *) module Kind : sig - type preendorsement_consensus_kind = Preendorsement_consensus_kind + type preattestation_consensus_kind = Preattestation_consensus_kind type endorsement_consensus_kind = Endorsement_consensus_kind type 'a consensus = - | Preendorsement_kind : preendorsement_consensus_kind consensus + | Preendorsement_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus - type preendorsement = preendorsement_consensus_kind consensus + type preendorsement = preattestation_consensus_kind consensus type endorsement = endorsement_consensus_kind consensus @@ -86,7 +86,7 @@ module Kind : sig endorsement_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = - preendorsement_consensus_kind double_consensus_operation_evidence + preattestation_consensus_kind double_consensus_operation_evidence type double_baking_evidence = Double_baking_evidence_kind -- GitLab From edc07be330e72acbf98749da077d9ff7104d14cd Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 30 Jun 2023 18:31:25 +0200 Subject: [PATCH 2/8] alpha: rename Preendorsement_kind --- src/proto_alpha/lib_protocol/alpha_context.mli | 2 +- src/proto_alpha/lib_protocol/operation_repr.ml | 2 +- src/proto_alpha/lib_protocol/operation_repr.mli | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 805c282c9791..223f7c8876de 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4004,7 +4004,7 @@ module Kind : sig type endorsement_consensus_kind = Endorsement_consensus_kind type 'a consensus = - | Preendorsement_kind : preattestation_consensus_kind consensus + | Preattestation_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus type preendorsement = preattestation_consensus_kind consensus diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 9531d3c7fbb3..3f67de873992 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -32,7 +32,7 @@ module Kind = struct type endorsement_consensus_kind = Endorsement_consensus_kind type 'a consensus = - | Preendorsement_kind : preattestation_consensus_kind consensus + | Preattestation_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus type preendorsement = preattestation_consensus_kind consensus diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 316b213018be..02ea52c43c2f 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -66,7 +66,7 @@ module Kind : sig type endorsement_consensus_kind = Endorsement_consensus_kind type 'a consensus = - | Preendorsement_kind : preattestation_consensus_kind consensus + | Preattestation_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus type preendorsement = preattestation_consensus_kind consensus -- GitLab From d4a7749285c40a4fb60885e3c222ad4e5c70443b Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 30 Jun 2023 18:45:19 +0200 Subject: [PATCH 3/8] alpha: rename preendorsement kind type --- src/proto_alpha/lib_delegate/baking_state.ml | 6 +++--- src/proto_alpha/lib_delegate/baking_state.mli | 6 +++--- .../lib_delegate/client_baking_denunciation.ml | 4 ++-- src/proto_alpha/lib_delegate/node_rpc.ml | 2 +- src/proto_alpha/lib_delegate/operation_pool.ml | 6 +++--- .../lib_delegate/operation_pool.mli | 8 ++++---- .../lib_delegate/operation_worker.ml | 6 +++--- .../lib_delegate/operation_worker.mli | 2 +- .../lib_delegate/state_transitions.ml | 2 +- .../lib_delegate/state_transitions.mli | 4 ++-- src/proto_alpha/lib_protocol/alpha_context.mli | 14 +++++++------- src/proto_alpha/lib_protocol/apply.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.mli | 2 +- src/proto_alpha/lib_protocol/operation_repr.ml | 18 +++++++++--------- .../lib_protocol/operation_repr.mli | 16 ++++++++-------- .../lib_protocol/test/helpers/op.mli | 10 +++++----- .../validate/generator_descriptors.ml | 2 +- .../validate/generator_descriptors.mli | 2 +- src/proto_alpha/lib_protocol/validate.ml | 10 +++++----- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/proto_alpha/lib_delegate/baking_state.ml b/src/proto_alpha/lib_delegate/baking_state.ml index 3009cb53ba40..72a69e3b3f6e 100644 --- a/src/proto_alpha/lib_delegate/baking_state.ml +++ b/src/proto_alpha/lib_delegate/baking_state.ml @@ -97,7 +97,7 @@ type prequorum = { level : int32; round : Round.t; block_payload_hash : Block_payload_hash.t; - preendorsements : Kind.preendorsement operation list; + preendorsements : Kind.preattestation operation list; } type block_info = { @@ -347,7 +347,7 @@ type round_state = { current_round : Round.t; current_phase : phase; delayed_prequorum : - (Operation_worker.candidate * Kind.preendorsement operation list) option; + (Operation_worker.candidate * Kind.preattestation operation list) option; } type state = { @@ -394,7 +394,7 @@ type event = | New_valid_proposal of proposal | New_head_proposal of proposal | Prequorum_reached of - Operation_worker.candidate * Kind.preendorsement operation list + Operation_worker.candidate * Kind.preattestation operation list | Quorum_reached of Operation_worker.candidate * Kind.endorsement operation list | Timeout of timeout_kind diff --git a/src/proto_alpha/lib_delegate/baking_state.mli b/src/proto_alpha/lib_delegate/baking_state.mli index c0340a6ddaa6..69636e9af1d9 100644 --- a/src/proto_alpha/lib_delegate/baking_state.mli +++ b/src/proto_alpha/lib_delegate/baking_state.mli @@ -51,7 +51,7 @@ type prequorum = { level : int32; round : Round.t; block_payload_hash : Block_payload_hash.t; - preendorsements : Kind.preendorsement operation list; + preendorsements : Kind.preattestation operation list; } type block_info = { @@ -150,7 +150,7 @@ type round_state = { current_round : Round.t; current_phase : phase; delayed_prequorum : - (Operation_worker.candidate * Kind.preendorsement operation list) option; + (Operation_worker.candidate * Kind.preattestation operation list) option; } type state = { @@ -173,7 +173,7 @@ type event = | New_valid_proposal of proposal | New_head_proposal of proposal | Prequorum_reached of - Operation_worker.candidate * Kind.preendorsement operation list + Operation_worker.candidate * Kind.preattestation operation list | Quorum_reached of Operation_worker.candidate * Kind.endorsement operation list | Timeout of timeout_kind diff --git a/src/proto_alpha/lib_delegate/client_baking_denunciation.ml b/src/proto_alpha/lib_delegate/client_baking_denunciation.ml index b5d30179cb4c..b0bc2ad48e9b 100644 --- a/src/proto_alpha/lib_delegate/client_baking_denunciation.ml +++ b/src/proto_alpha/lib_delegate/client_baking_denunciation.ml @@ -65,7 +65,7 @@ type 'kind recorded_consensus = type recorded_consensus_operations = { endorsement : Kind.endorsement recorded_consensus; - preendorsement : Kind.preendorsement recorded_consensus; + preendorsement : Kind.preattestation recorded_consensus; } type 'a state = { @@ -332,7 +332,7 @@ let process_operations (cctxt : #Protocol_client_context.full) state | Operation_data ({contents = Single (Preendorsement {round; slot; level; _}); _} as protocol_data) -> - let new_preendorsement : Kind.preendorsement Alpha_context.operation = + let new_preendorsement : Kind.preattestation Alpha_context.operation = {shell; protocol_data} in process_consensus_op diff --git a/src/proto_alpha/lib_delegate/node_rpc.ml b/src/proto_alpha/lib_delegate/node_rpc.ml index 7a06360d3283..b1d990b11939 100644 --- a/src/proto_alpha/lib_delegate/node_rpc.ml +++ b/src/proto_alpha/lib_delegate/node_rpc.ml @@ -64,7 +64,7 @@ let extract_prequorum preendorsements = | h :: _ -> let ({protocol_data = {contents = Single (Preendorsement content); _}; _}) = - (h : Kind.preendorsement Operation.t) + (h : Kind.preattestation Operation.t) in Some { diff --git a/src/proto_alpha/lib_delegate/operation_pool.ml b/src/proto_alpha/lib_delegate/operation_pool.ml index 71a5035c41c4..a8b9579e2142 100644 --- a/src/proto_alpha/lib_delegate/operation_pool.ml +++ b/src/proto_alpha/lib_delegate/operation_pool.ml @@ -258,7 +258,7 @@ let unpack_preendorsement packed_preendorsement = let {shell; protocol_data = Operation_data data} = packed_preendorsement in match data with | {contents = Single (Preendorsement _); _} -> - Some ({shell; protocol_data = data} : Kind.preendorsement Operation.t) + Some ({shell; protocol_data = data} : Kind.preattestation Operation.t) | _ -> None let unpack_endorsement packed_endorsement = @@ -287,7 +287,7 @@ let filter_preendorsements ops = } -> Some ({shell = {branch}; protocol_data = content} - : Kind.preendorsement operation) + : Kind.preattestation operation) | _ -> None) ops @@ -334,7 +334,7 @@ let extract_operations_of_list_list = function | [consensus; votes_payload; anonymous_payload; managers_payload] -> let preendorsements, endorsements, dal_attestations = List.fold_left - (fun ( (preendorsements : Kind.preendorsement Operation.t list), + (fun ( (preendorsements : Kind.preattestation Operation.t list), (endorsements : Kind.endorsement Operation.t list), (dal_attestations : Kind.dal_attestation Operation.t list) ) packed_op -> diff --git a/src/proto_alpha/lib_delegate/operation_pool.mli b/src/proto_alpha/lib_delegate/operation_pool.mli index 67ddb289a78b..ef3127bb340d 100644 --- a/src/proto_alpha/lib_delegate/operation_pool.mli +++ b/src/proto_alpha/lib_delegate/operation_pool.mli @@ -93,7 +93,7 @@ val filter_with_relevant_consensus_ops : Operation_set.t val unpack_preendorsement : - packed_operation -> Kind.preendorsement operation option + packed_operation -> Kind.preattestation operation option val unpack_endorsement : packed_operation -> Kind.endorsement operation option @@ -101,7 +101,7 @@ val unpack_dal_attestation : packed_operation -> Kind.dal_attestation operation option val filter_preendorsements : - packed_operation list -> Kind.preendorsement operation list + packed_operation list -> Kind.preattestation operation list val filter_endorsements : packed_operation list -> Kind.endorsement operation list @@ -110,10 +110,10 @@ val ordered_to_list_list : ordered_pool -> packed_operation list list val ordered_of_list_list : packed_operation list list -> ordered_pool option -(** [preendorsements] <> None => (List.length preendorsements > 0) *) +(** [preattestation] <> None => (List.length preattestations > 0) *) val extract_operations_of_list_list : packed_operation list list -> - (Kind.preendorsement operation list option + (Kind.preattestation operation list option * Kind.endorsement operation list * Kind.dal_attestation operation list * payload) diff --git a/src/proto_alpha/lib_delegate/operation_worker.ml b/src/proto_alpha/lib_delegate/operation_worker.ml index e4c53d7e28b9..df703ccf15ae 100644 --- a/src/proto_alpha/lib_delegate/operation_worker.ml +++ b/src/proto_alpha/lib_delegate/operation_worker.ml @@ -156,7 +156,7 @@ let candidate_encoding = (req "payload_hash_watched" Block_payload_hash.encoding)) type event = - | Prequorum_reached of candidate * Kind.preendorsement operation list + | Prequorum_reached of candidate * Kind.preattestation operation list | Quorum_reached of candidate * Kind.endorsement operation list let compare_consensus_contents (op1 : consensus_content) @@ -167,7 +167,7 @@ let compare_consensus_contents (op1 : consensus_content) Block_payload_hash.compare op1.block_payload_hash op2.block_payload_hash module Preendorsement_set = Set.Make (struct - type t = Kind.preendorsement operation + type t = Kind.preattestation operation let compare ({protocol_data = {contents = Single (Preendorsement op1); _}; shell = _} : @@ -315,7 +315,7 @@ let update_monitoring ?(should_lock = true) state ops = in let preendorsements_count, voting_power = List.fold_left - (fun (count, power) (op : Kind.preendorsement Operation.t) -> + (fun (count, power) (op : Kind.preattestation Operation.t) -> let { shell = _; protocol_data = diff --git a/src/proto_alpha/lib_delegate/operation_worker.mli b/src/proto_alpha/lib_delegate/operation_worker.mli index b62caa996da2..6d623d62aba1 100644 --- a/src/proto_alpha/lib_delegate/operation_worker.mli +++ b/src/proto_alpha/lib_delegate/operation_worker.mli @@ -42,7 +42,7 @@ type candidate = { val candidate_encoding : candidate Data_encoding.t type event = - | Prequorum_reached of candidate * Kind.preendorsement operation list + | Prequorum_reached of candidate * Kind.preattestation operation list | Quorum_reached of candidate * Kind.endorsement operation list (** {1 Constructors}*) diff --git a/src/proto_alpha/lib_delegate/state_transitions.ml b/src/proto_alpha/lib_delegate/state_transitions.ml index f462710ba872..5d5c71950176 100644 --- a/src/proto_alpha/lib_delegate/state_transitions.ml +++ b/src/proto_alpha/lib_delegate/state_transitions.ml @@ -145,7 +145,7 @@ let extract_pqc state (new_proposal : proposal) = match new_proposal.block.prequorum with | None -> None | Some pqc -> - let add_voting_power acc (op : Kind.preendorsement Operation.t) = + let add_voting_power acc (op : Kind.preattestation Operation.t) = let open Protocol.Alpha_context.Operation in let { shell = _; diff --git a/src/proto_alpha/lib_delegate/state_transitions.mli b/src/proto_alpha/lib_delegate/state_transitions.mli index 1ea303458ca9..14b0363492c8 100644 --- a/src/proto_alpha/lib_delegate/state_transitions.mli +++ b/src/proto_alpha/lib_delegate/state_transitions.mli @@ -47,7 +47,7 @@ val may_update_proposal : val preendorse : state -> proposal -> (state * action) Lwt.t val extract_pqc : - state -> proposal -> (Kind.preendorsement operation list * Round.t) option + state -> proposal -> (Kind.preattestation operation list * Round.t) option val handle_proposal : is_proposal_applied:bool -> state -> proposal -> (state * action) Lwt.t @@ -85,7 +85,7 @@ val make_endorse_action : state -> proposal -> action val prequorum_reached_when_awaiting_preendorsements : state -> Operation_worker.candidate -> - Kind.preendorsement operation list -> + Kind.preattestation operation list -> (state * action) Lwt.t val quorum_reached_when_waiting_endorsements : diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 223f7c8876de..ba59d3fec6ea 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4007,7 +4007,7 @@ module Kind : sig | Preattestation_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus - type preendorsement = preattestation_consensus_kind consensus + type preattestation = preattestation_consensus_kind consensus type endorsement = endorsement_consensus_kind consensus @@ -4110,7 +4110,7 @@ end type 'a consensus_operation_type = | Endorsement : Kind.endorsement consensus_operation_type - | Preendorsement : Kind.preendorsement consensus_operation_type + | Preendorsement : Kind.preattestation consensus_operation_type type consensus_content = { slot : Slot.t; @@ -4143,7 +4143,7 @@ and _ contents_list = -> ('kind * 'rest) Kind.manager contents_list and _ contents = - | Preendorsement : consensus_content -> Kind.preendorsement contents + | Preendorsement : consensus_content -> Kind.preattestation contents | Endorsement : consensus_content -> Kind.endorsement contents | Dal_attestation : Dal.Attestation.operation -> Kind.dal_attestation contents | Seed_nonce_revelation : { @@ -4156,8 +4156,8 @@ and _ contents = } -> Kind.vdf_revelation contents | Double_preendorsement_evidence : { - op1 : Kind.preendorsement operation; - op2 : Kind.preendorsement operation; + op1 : Kind.preattestation operation; + op2 : Kind.preattestation operation; } -> Kind.double_preendorsement_evidence contents | Double_endorsement_evidence : { @@ -4420,9 +4420,9 @@ module Operation : sig } -> 'b case - val preendorsement_case : Kind.preendorsement case + val preendorsement_case : Kind.preattestation case - val preattestation_case : Kind.preendorsement case + val preattestation_case : Kind.preattestation case val endorsement_case : Kind.endorsement case diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index 167e17afb475..b214b31f8210 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -1978,7 +1978,7 @@ let find_in_slot_map consensus_content slot_map = | Some (consensus_key, power) -> ok (consensus_key, power)) let record_preendorsement ctxt (mode : mode) (content : consensus_content) : - (context * Kind.preendorsement contents_result_list) tzresult Lwt.t = + (context * Kind.preattestation contents_result_list) tzresult Lwt.t = let open Lwt_result_syntax in let ctxt = match mode with diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index e9298c5001cb..49e19987f944 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -856,7 +856,7 @@ type 'kind contents_result = consensus_key : Signature.public_key_hash; consensus_power : int; } - -> Kind.preendorsement contents_result + -> Kind.preattestation contents_result | Endorsement_result : { balance_updates : Receipt.balance_updates; delegate : Signature.public_key_hash; diff --git a/src/proto_alpha/lib_protocol/apply_results.mli b/src/proto_alpha/lib_protocol/apply_results.mli index 8a4e17940b5a..62eec427c99a 100644 --- a/src/proto_alpha/lib_protocol/apply_results.mli +++ b/src/proto_alpha/lib_protocol/apply_results.mli @@ -64,7 +64,7 @@ and 'kind contents_result = consensus_key : Signature.public_key_hash; consensus_power : int; } - -> Kind.preendorsement contents_result + -> Kind.preattestation contents_result | Endorsement_result : { balance_updates : Receipt.balance_updates; delegate : Signature.public_key_hash; diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 3f67de873992..d6b202666249 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -35,7 +35,7 @@ module Kind = struct | Preattestation_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus - type preendorsement = preattestation_consensus_kind consensus + type preattestation = preattestation_consensus_kind consensus type endorsement = endorsement_consensus_kind consensus @@ -136,7 +136,7 @@ end type 'a consensus_operation_type = | Endorsement : Kind.endorsement consensus_operation_type - | Preendorsement : Kind.preendorsement consensus_operation_type + | Preendorsement : Kind.preattestation consensus_operation_type type consensus_content = { slot : Slot_repr.t; @@ -234,7 +234,7 @@ and _ contents_list = -> ('kind * 'rest) Kind.manager contents_list and _ contents = - | Preendorsement : consensus_content -> Kind.preendorsement contents + | Preendorsement : consensus_content -> Kind.preattestation contents | Endorsement : consensus_content -> Kind.endorsement contents | Dal_attestation : Dal_attestation_repr.operation @@ -249,8 +249,8 @@ and _ contents = } -> Kind.vdf_revelation contents | Double_preendorsement_evidence : { - op1 : Kind.preendorsement operation; - op2 : Kind.preendorsement operation; + op1 : Kind.preattestation operation; + op2 : Kind.preattestation operation; } -> Kind.double_preendorsement_evidence contents | Double_endorsement_evidence : { @@ -1019,10 +1019,10 @@ module Encoding = struct let make (Case {tag; name; encoding; select = _; proj; inj}) = case (Tag tag) name encoding (fun o -> Some (proj o)) (fun x -> inj x) in - let to_list : Kind.preendorsement contents_list -> _ = function + let to_list : Kind.preattestation contents_list -> _ = function | Single o -> o in - let of_list : Kind.preendorsement contents -> _ = function + let of_list : Kind.preattestation contents -> _ = function | o -> Single o in def "inlined.preendorsement" @@ -1045,10 +1045,10 @@ module Encoding = struct let make (Case {tag; name; encoding; select = _; proj; inj}) = case (Tag tag) name encoding (fun o -> Some (proj o)) (fun x -> inj x) in - let to_list : Kind.preendorsement contents_list -> _ = function + let to_list : Kind.preattestation contents_list -> _ = function | Single o -> o in - let of_list : Kind.preendorsement contents -> _ = function + let of_list : Kind.preattestation contents -> _ = function | o -> Single o in def "inlined.preattestation" diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 02ea52c43c2f..f6e05ae9ac0f 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -27,7 +27,7 @@ (** Tezos Protocol Implementation - Low level Repr. of Operations Defines kinds of operations that can be performed on chain: - - preendorsement + - preattestation - endorsement - double baking evidence - double preendorsing evidence @@ -69,7 +69,7 @@ module Kind : sig | Preattestation_kind : preattestation_consensus_kind consensus | Endorsement_kind : endorsement_consensus_kind consensus - type preendorsement = preattestation_consensus_kind consensus + type preattestation = preattestation_consensus_kind consensus type endorsement = endorsement_consensus_kind consensus @@ -170,7 +170,7 @@ end type 'a consensus_operation_type = | Endorsement : Kind.endorsement consensus_operation_type - | Preendorsement : Kind.preendorsement consensus_operation_type + | Preendorsement : Kind.preattestation consensus_operation_type type consensus_content = { slot : Slot_repr.t; @@ -230,7 +230,7 @@ and _ contents_list = and _ contents = (* Preendorsement: About consensus, preendorsement of a block held by a validator (specific to Tenderbake). *) - | Preendorsement : consensus_content -> Kind.preendorsement contents + | Preendorsement : consensus_content -> Kind.preattestation contents (* Endorsement: About consensus, endorsement of a block held by a validator. *) | Endorsement : consensus_content -> Kind.endorsement contents @@ -262,8 +262,8 @@ and _ contents = twice. This behavior may be reported and the byzantine will have its security deposit forfeited. *) | Double_preendorsement_evidence : { - op1 : Kind.preendorsement operation; - op2 : Kind.preendorsement operation; + op1 : Kind.preattestation operation; + op2 : Kind.preattestation operation; } -> Kind.double_preendorsement_evidence contents (* Double_endorsement_evidence: Similar to double-preendorsement but @@ -669,9 +669,9 @@ module Encoding : sig } -> 'b case - val preendorsement_case : Kind.preendorsement case + val preendorsement_case : Kind.preattestation case - val preattestation_case : Kind.preendorsement case + val preattestation_case : Kind.preattestation case val endorsement_case : Kind.endorsement case diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.mli b/src/proto_alpha/lib_protocol/test/helpers/op.mli index 39fb652e5dc6..979b9287d46e 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/op.mli @@ -71,7 +71,7 @@ val raw_endorsement : Block.t -> Kind.endorsement Operation.t tzresult Lwt.t -(** Create an unpacked preendorsement that is expected for a given +(** Create an unpacked preattestation that is expected for a given [Block.t]. Optional parameters are the same than {!raw_endorsement}. *) @@ -83,7 +83,7 @@ val raw_preendorsement : ?block_payload_hash:Block_payload_hash.t -> ?branch:Block_hash.t -> Block.t -> - Kind.preendorsement Operation.t tzresult Lwt.t + Kind.preattestation Operation.t tzresult Lwt.t (** Create a packed endorsement that is expected for a given [Block.t] by packing the result of {!raw_endorsement}. *) @@ -97,7 +97,7 @@ val endorsement : Block.t -> Operation.packed tzresult Lwt.t -(** Create a packed preendorsement that is expected for a given +(** Create a packed preattestation that is expected for a given [Block.t] by packing the result of {!raw_preendorsement}. *) val preendorsement : ?delegate:public_key_hash -> @@ -281,8 +281,8 @@ val double_endorsement : val double_preendorsement : Context.t -> - Kind.preendorsement Operation.t -> - Kind.preendorsement Operation.t -> + Kind.preattestation Operation.t -> + Kind.preattestation Operation.t -> Operation.packed val double_baking : diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml index 6300c610dc8e..3ff8d5803182 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml +++ b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml @@ -30,7 +30,7 @@ open Validate_helpers type dbl_endorsement_state = { temporary : (Block.t * Block.t) option; slashable_preend : - (Kind.preendorsement operation * Kind.preendorsement operation) list; + (Kind.preattestation operation * Kind.preattestation operation) list; slashable_end : (Kind.endorsement operation * Kind.endorsement operation) list; } diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli index 515df860cfa4..239e3361f87d 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli +++ b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli @@ -36,7 +36,7 @@ open Validate_helpers type dbl_endorsement_state = { temporary : (Block.t * Block.t) option; slashable_preend : - (Kind.preendorsement operation * Kind.preendorsement operation) list; + (Kind.preattestation operation * Kind.preattestation operation) list; slashable_end : (Kind.endorsement operation * Kind.endorsement operation) list; } diff --git a/src/proto_alpha/lib_protocol/validate.ml b/src/proto_alpha/lib_protocol/validate.ml index b4829f684dc6..dda673a9200e 100644 --- a/src/proto_alpha/lib_protocol/validate.ml +++ b/src/proto_alpha/lib_protocol/validate.ml @@ -578,7 +578,7 @@ module Consensus = struct mempool's context. *) let check_preendorsement vi ~check_signature - (operation : Kind.preendorsement operation) = + (operation : Kind.preattestation operation) = let open Lwt_result_syntax in let*? consensus_info = Option.value_e @@ -619,7 +619,7 @@ module Consensus = struct in return voting_power - let check_preendorsement_conflict vs oph (op : Kind.preendorsement operation) + let check_preendorsement_conflict vs oph (op : Kind.preattestation operation) = let (Single (Preendorsement {slot; level; round; _})) = op.protocol_data.contents @@ -640,7 +640,7 @@ module Consensus = struct Validate_errors.Consensus.( Conflicting_consensus_operation {kind = Preattestation; conflict}) - let add_preendorsement vs oph (op : Kind.preendorsement operation) = + let add_preendorsement vs oph (op : Kind.preattestation operation) = let (Single (Preendorsement {slot; level; round; _})) = op.protocol_data.contents in @@ -672,7 +672,7 @@ module Consensus = struct {block_state with locked_round_evidence} (* Hypothesis: this function will only be called in mempool mode *) - let remove_preendorsement vs (operation : Kind.preendorsement operation) = + let remove_preendorsement vs (operation : Kind.preattestation operation) = (* As we are in mempool mode, we do not update [locked_round_evidence]. *) let (Single (Preendorsement {slot; level; round; _})) = @@ -896,7 +896,7 @@ module Consensus = struct | Application _ | Partial_validation _ | Mempool -> return_unit let validate_preendorsement ~check_signature info operation_state block_state - oph (operation : Kind.preendorsement operation) = + oph (operation : Kind.preattestation operation) = let open Lwt_result_syntax in let (Single (Preendorsement consensus_content)) = operation.protocol_data.contents -- GitLab From e2962726276b46b6a676a8940904c8309e3c55b9 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 30 Jun 2023 18:29:37 +0200 Subject: [PATCH 4/8] alpha: rename Endorsement_consensus_kind --- src/proto_alpha/lib_protocol/alpha_context.mli | 8 ++++---- src/proto_alpha/lib_protocol/operation_repr.ml | 8 ++++---- src/proto_alpha/lib_protocol/operation_repr.mli | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index ba59d3fec6ea..4fa50fdab9b0 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4001,15 +4001,15 @@ end module Kind : sig type preattestation_consensus_kind = Preattestation_consensus_kind - type endorsement_consensus_kind = Endorsement_consensus_kind + type attestation_consensus_kind = Attestation_consensus_kind type 'a consensus = | Preattestation_kind : preattestation_consensus_kind consensus - | Endorsement_kind : endorsement_consensus_kind consensus + | Endorsement_kind : attestation_consensus_kind consensus type preattestation = preattestation_consensus_kind consensus - type endorsement = endorsement_consensus_kind consensus + type endorsement = attestation_consensus_kind consensus type dal_attestation = Dal_attestation_kind @@ -4021,7 +4021,7 @@ module Kind : sig | Double_consensus_operation_evidence type double_endorsement_evidence = - endorsement_consensus_kind double_consensus_operation_evidence + attestation_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = preattestation_consensus_kind double_consensus_operation_evidence diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index d6b202666249..ef230e32e79e 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -29,15 +29,15 @@ module Kind = struct type preattestation_consensus_kind = Preattestation_consensus_kind - type endorsement_consensus_kind = Endorsement_consensus_kind + type attestation_consensus_kind = Attestation_consensus_kind type 'a consensus = | Preattestation_kind : preattestation_consensus_kind consensus - | Endorsement_kind : endorsement_consensus_kind consensus + | Endorsement_kind : attestation_consensus_kind consensus type preattestation = preattestation_consensus_kind consensus - type endorsement = endorsement_consensus_kind consensus + type endorsement = attestation_consensus_kind consensus type dal_attestation = Dal_attestation_kind @@ -49,7 +49,7 @@ module Kind = struct | Double_consensus_operation_evidence type double_endorsement_evidence = - endorsement_consensus_kind double_consensus_operation_evidence + attestation_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = preattestation_consensus_kind double_consensus_operation_evidence diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index f6e05ae9ac0f..19f3356fb142 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -63,15 +63,15 @@ module Kind : sig type preattestation_consensus_kind = Preattestation_consensus_kind - type endorsement_consensus_kind = Endorsement_consensus_kind + type attestation_consensus_kind = Attestation_consensus_kind type 'a consensus = | Preattestation_kind : preattestation_consensus_kind consensus - | Endorsement_kind : endorsement_consensus_kind consensus + | Endorsement_kind : attestation_consensus_kind consensus type preattestation = preattestation_consensus_kind consensus - type endorsement = endorsement_consensus_kind consensus + type endorsement = attestation_consensus_kind consensus type dal_attestation = Dal_attestation_kind @@ -83,7 +83,7 @@ module Kind : sig | Double_consensus_operation_evidence type double_endorsement_evidence = - endorsement_consensus_kind double_consensus_operation_evidence + attestation_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = preattestation_consensus_kind double_consensus_operation_evidence -- GitLab From 5cf102acc7ca2014adab5d554a4914cca138ce76 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 30 Jun 2023 18:32:27 +0200 Subject: [PATCH 5/8] alpha: rename Endorsement_kind --- src/proto_alpha/lib_protocol/alpha_context.mli | 2 +- src/proto_alpha/lib_protocol/operation_repr.ml | 2 +- src/proto_alpha/lib_protocol/operation_repr.mli | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 4fa50fdab9b0..49ec64677597 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4005,7 +4005,7 @@ module Kind : sig type 'a consensus = | Preattestation_kind : preattestation_consensus_kind consensus - | Endorsement_kind : attestation_consensus_kind consensus + | Attestation_kind : attestation_consensus_kind consensus type preattestation = preattestation_consensus_kind consensus diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index ef230e32e79e..8f42fd3e71c9 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -33,7 +33,7 @@ module Kind = struct type 'a consensus = | Preattestation_kind : preattestation_consensus_kind consensus - | Endorsement_kind : attestation_consensus_kind consensus + | Attestation_kind : attestation_consensus_kind consensus type preattestation = preattestation_consensus_kind consensus diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 19f3356fb142..05823e7f08d1 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -67,7 +67,7 @@ module Kind : sig type 'a consensus = | Preattestation_kind : preattestation_consensus_kind consensus - | Endorsement_kind : attestation_consensus_kind consensus + | Attestation_kind : attestation_consensus_kind consensus type preattestation = preattestation_consensus_kind consensus -- GitLab From acb327e1758821835a5843a17f51222038f84fbc Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Mon, 3 Jul 2023 09:02:00 +0200 Subject: [PATCH 6/8] alpha: rename endorsement kind type --- src/proto_alpha/lib_delegate/baking_lib.ml | 4 ++-- src/proto_alpha/lib_delegate/baking_state.ml | 6 +++--- src/proto_alpha/lib_delegate/baking_state.mli | 6 +++--- .../lib_delegate/client_baking_denunciation.ml | 4 ++-- src/proto_alpha/lib_delegate/operation_pool.ml | 6 +++--- .../lib_delegate/operation_pool.mli | 6 +++--- .../lib_delegate/operation_worker.ml | 6 +++--- .../lib_delegate/operation_worker.mli | 2 +- .../lib_delegate/state_transitions.mli | 4 ++-- src/proto_alpha/lib_protocol/alpha_context.mli | 14 +++++++------- src/proto_alpha/lib_protocol/apply.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.mli | 2 +- src/proto_alpha/lib_protocol/operation_repr.ml | 18 +++++++++--------- .../lib_protocol/operation_repr.mli | 16 ++++++++-------- .../lib_protocol/test/helpers/op.mli | 16 ++++++++-------- .../validate/generator_descriptors.ml | 12 ++++++------ .../validate/generator_descriptors.mli | 2 +- src/proto_alpha/lib_protocol/validate.ml | 8 ++++---- 19 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/proto_alpha/lib_delegate/baking_lib.ml b/src/proto_alpha/lib_delegate/baking_lib.ml index 2677f6cf8fd9..8d6994eeb907 100644 --- a/src/proto_alpha/lib_delegate/baking_lib.ml +++ b/src/proto_alpha/lib_delegate/baking_lib.ml @@ -202,7 +202,7 @@ let state_endorsing_power = protocol_data = {contents = Single (Endorsement consensus_content); _}; _; } : - Kind.endorsement operation) + Kind.attestation operation) -> consensus_content) let do_action (state, action) = @@ -425,7 +425,7 @@ let baking_minimal_timestamp state = {contents = Single (Endorsement consensus_content); _}; _; } : - Kind.endorsement operation) + Kind.attestation operation) -> if Round.(consensus_content.round = latest_proposal.block.round) diff --git a/src/proto_alpha/lib_delegate/baking_state.ml b/src/proto_alpha/lib_delegate/baking_state.ml index 72a69e3b3f6e..9892bc9fc4f6 100644 --- a/src/proto_alpha/lib_delegate/baking_state.ml +++ b/src/proto_alpha/lib_delegate/baking_state.ml @@ -107,7 +107,7 @@ type block_info = { payload_round : Round.t; round : Round.t; prequorum : prequorum option; - quorum : Kind.endorsement operation list; + quorum : Kind.attestation operation list; dal_attestations : Kind.dal_attestation operation list; payload : Operation_pool.payload; } @@ -283,7 +283,7 @@ let endorsable_payload_encoding = type elected_block = { proposal : proposal; - endorsement_qc : Kind.endorsement Operation.t list; + endorsement_qc : Kind.attestation Operation.t list; } (* Updated only when we receive a block at a different level. @@ -396,7 +396,7 @@ type event = | Prequorum_reached of Operation_worker.candidate * Kind.preattestation operation list | Quorum_reached of - Operation_worker.candidate * Kind.endorsement operation list + Operation_worker.candidate * Kind.attestation operation list | Timeout of timeout_kind let event_encoding = diff --git a/src/proto_alpha/lib_delegate/baking_state.mli b/src/proto_alpha/lib_delegate/baking_state.mli index 69636e9af1d9..585b2fe4762a 100644 --- a/src/proto_alpha/lib_delegate/baking_state.mli +++ b/src/proto_alpha/lib_delegate/baking_state.mli @@ -61,7 +61,7 @@ type block_info = { payload_round : Round.t; round : Round.t; prequorum : prequorum option; - quorum : Kind.endorsement operation list; + quorum : Kind.attestation operation list; dal_attestations : Kind.dal_attestation operation list; payload : Operation_pool.payload; } @@ -123,7 +123,7 @@ val endorsable_payload_encoding : endorsable_payload Data_encoding.t type elected_block = { proposal : proposal; - endorsement_qc : Kind.endorsement operation list; + endorsement_qc : Kind.attestation operation list; } type level_state = { @@ -175,7 +175,7 @@ type event = | Prequorum_reached of Operation_worker.candidate * Kind.preattestation operation list | Quorum_reached of - Operation_worker.candidate * Kind.endorsement operation list + Operation_worker.candidate * Kind.attestation operation list | Timeout of timeout_kind val event_encoding : event Data_encoding.t diff --git a/src/proto_alpha/lib_delegate/client_baking_denunciation.ml b/src/proto_alpha/lib_delegate/client_baking_denunciation.ml index b0bc2ad48e9b..bf70015af1d1 100644 --- a/src/proto_alpha/lib_delegate/client_baking_denunciation.ml +++ b/src/proto_alpha/lib_delegate/client_baking_denunciation.ml @@ -64,7 +64,7 @@ type 'kind recorded_consensus = } type recorded_consensus_operations = { - endorsement : Kind.endorsement recorded_consensus; + endorsement : Kind.attestation recorded_consensus; preendorsement : Kind.preattestation recorded_consensus; } @@ -347,7 +347,7 @@ let process_operations (cctxt : #Protocol_client_context.full) state | Operation_data ({contents = Single (Endorsement {round; slot; level; _}); _} as protocol_data) -> - let new_endorsement : Kind.endorsement Alpha_context.operation = + let new_endorsement : Kind.attestation Alpha_context.operation = {shell; protocol_data} in process_consensus_op diff --git a/src/proto_alpha/lib_delegate/operation_pool.ml b/src/proto_alpha/lib_delegate/operation_pool.ml index a8b9579e2142..2aafc9cfbf66 100644 --- a/src/proto_alpha/lib_delegate/operation_pool.ml +++ b/src/proto_alpha/lib_delegate/operation_pool.ml @@ -265,7 +265,7 @@ let unpack_endorsement packed_endorsement = let {shell; protocol_data = Operation_data data} = packed_endorsement in match data with | {contents = Single (Endorsement _); _} -> - Some ({shell; protocol_data = data} : Kind.endorsement Operation.t) + Some ({shell; protocol_data = data} : Kind.attestation Operation.t) | _ -> None let unpack_dal_attestation packed_dal_attestation = @@ -302,7 +302,7 @@ let filter_endorsements ops = } -> Some ({shell = {branch}; protocol_data = content} - : Kind.endorsement operation) + : Kind.attestation operation) | _ -> None) ops @@ -335,7 +335,7 @@ let extract_operations_of_list_list = function let preendorsements, endorsements, dal_attestations = List.fold_left (fun ( (preendorsements : Kind.preattestation Operation.t list), - (endorsements : Kind.endorsement Operation.t list), + (endorsements : Kind.attestation Operation.t list), (dal_attestations : Kind.dal_attestation Operation.t list) ) packed_op -> let {shell; protocol_data = Operation_data data} = packed_op in diff --git a/src/proto_alpha/lib_delegate/operation_pool.mli b/src/proto_alpha/lib_delegate/operation_pool.mli index ef3127bb340d..289061f11ae6 100644 --- a/src/proto_alpha/lib_delegate/operation_pool.mli +++ b/src/proto_alpha/lib_delegate/operation_pool.mli @@ -95,7 +95,7 @@ val filter_with_relevant_consensus_ops : val unpack_preendorsement : packed_operation -> Kind.preattestation operation option -val unpack_endorsement : packed_operation -> Kind.endorsement operation option +val unpack_endorsement : packed_operation -> Kind.attestation operation option val unpack_dal_attestation : packed_operation -> Kind.dal_attestation operation option @@ -104,7 +104,7 @@ val filter_preendorsements : packed_operation list -> Kind.preattestation operation list val filter_endorsements : - packed_operation list -> Kind.endorsement operation list + packed_operation list -> Kind.attestation operation list val ordered_to_list_list : ordered_pool -> packed_operation list list @@ -114,7 +114,7 @@ val ordered_of_list_list : packed_operation list list -> ordered_pool option val extract_operations_of_list_list : packed_operation list list -> (Kind.preattestation operation list option - * Kind.endorsement operation list + * Kind.attestation operation list * Kind.dal_attestation operation list * payload) option diff --git a/src/proto_alpha/lib_delegate/operation_worker.ml b/src/proto_alpha/lib_delegate/operation_worker.ml index df703ccf15ae..3e4544814e5d 100644 --- a/src/proto_alpha/lib_delegate/operation_worker.ml +++ b/src/proto_alpha/lib_delegate/operation_worker.ml @@ -157,7 +157,7 @@ let candidate_encoding = type event = | Prequorum_reached of candidate * Kind.preattestation operation list - | Quorum_reached of candidate * Kind.endorsement operation list + | Quorum_reached of candidate * Kind.attestation operation list let compare_consensus_contents (op1 : consensus_content) (op2 : consensus_content) = @@ -178,7 +178,7 @@ module Preendorsement_set = Set.Make (struct end) module Endorsement_set = Set.Make (struct - type t = Kind.endorsement operation + type t = Kind.attestation operation let compare ({protocol_data = {contents = Single (Endorsement op1); _}; shell = _} : @@ -387,7 +387,7 @@ let update_monitoring ?(should_lock = true) state ops = in let endorsements_count, voting_power = List.fold_left - (fun (count, power) (op : Kind.endorsement Operation.t) -> + (fun (count, power) (op : Kind.attestation Operation.t) -> let { shell = _; protocol_data = diff --git a/src/proto_alpha/lib_delegate/operation_worker.mli b/src/proto_alpha/lib_delegate/operation_worker.mli index 6d623d62aba1..f0bbb39d830a 100644 --- a/src/proto_alpha/lib_delegate/operation_worker.mli +++ b/src/proto_alpha/lib_delegate/operation_worker.mli @@ -43,7 +43,7 @@ val candidate_encoding : candidate Data_encoding.t type event = | Prequorum_reached of candidate * Kind.preattestation operation list - | Quorum_reached of candidate * Kind.endorsement operation list + | Quorum_reached of candidate * Kind.attestation operation list (** {1 Constructors}*) diff --git a/src/proto_alpha/lib_delegate/state_transitions.mli b/src/proto_alpha/lib_delegate/state_transitions.mli index 14b0363492c8..b103418841f4 100644 --- a/src/proto_alpha/lib_delegate/state_transitions.mli +++ b/src/proto_alpha/lib_delegate/state_transitions.mli @@ -59,7 +59,7 @@ val round_proposer : (consensus_key_and_delegate * endorsing_slot) option val propose_fresh_block_action : - endorsements:Kind.endorsement Operation.t list -> + endorsements:Kind.attestation Operation.t list -> dal_attestations:Kind.dal_attestation Operation.t list -> ?last_proposal:block_info -> predecessor:block_info -> @@ -91,7 +91,7 @@ val prequorum_reached_when_awaiting_preendorsements : val quorum_reached_when_waiting_endorsements : state -> Operation_worker.candidate -> - Kind.endorsement operation list -> + Kind.attestation operation list -> (state * action) Lwt.t val step : state -> event -> (state * action) Lwt.t diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 49ec64677597..f8c04aea51e0 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4009,7 +4009,7 @@ module Kind : sig type preattestation = preattestation_consensus_kind consensus - type endorsement = attestation_consensus_kind consensus + type attestation = attestation_consensus_kind consensus type dal_attestation = Dal_attestation_kind @@ -4109,7 +4109,7 @@ end (** All the definitions below are re-exported from {!Operation_repr}. *) type 'a consensus_operation_type = - | Endorsement : Kind.endorsement consensus_operation_type + | Endorsement : Kind.attestation consensus_operation_type | Preendorsement : Kind.preattestation consensus_operation_type type consensus_content = { @@ -4144,7 +4144,7 @@ and _ contents_list = and _ contents = | Preendorsement : consensus_content -> Kind.preattestation contents - | Endorsement : consensus_content -> Kind.endorsement contents + | Endorsement : consensus_content -> Kind.attestation contents | Dal_attestation : Dal.Attestation.operation -> Kind.dal_attestation contents | Seed_nonce_revelation : { level : Raw_level.t; @@ -4161,8 +4161,8 @@ and _ contents = } -> Kind.double_preendorsement_evidence contents | Double_endorsement_evidence : { - op1 : Kind.endorsement operation; - op2 : Kind.endorsement operation; + op1 : Kind.attestation operation; + op2 : Kind.attestation operation; } -> Kind.double_endorsement_evidence contents | Double_baking_evidence : { @@ -4424,9 +4424,9 @@ module Operation : sig val preattestation_case : Kind.preattestation case - val endorsement_case : Kind.endorsement case + val endorsement_case : Kind.attestation case - val attestation_case : Kind.endorsement case + val attestation_case : Kind.attestation case val dal_attestation_case : Kind.dal_attestation case diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index b214b31f8210..baed815465d0 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -2027,7 +2027,7 @@ let record_preendorsement ctxt (mode : mode) (content : consensus_content) : return (ctxt, mk_preendorsement_result consensus_key 0 (* Fake power. *)) let record_endorsement ctxt (mode : mode) (content : consensus_content) : - (context * Kind.endorsement contents_result_list) tzresult Lwt.t = + (context * Kind.attestation contents_result_list) tzresult Lwt.t = let open Lwt_result_syntax in let mk_endorsement_result ({delegate; consensus_pkh; _} : Consensus_key.pk) consensus_power = diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index 49e19987f944..db8e12c0524c 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -863,7 +863,7 @@ type 'kind contents_result = consensus_key : Signature.public_key_hash; consensus_power : int; } - -> Kind.endorsement contents_result + -> Kind.attestation contents_result | Dal_attestation_result : { delegate : Signature.Public_key_hash.t; } diff --git a/src/proto_alpha/lib_protocol/apply_results.mli b/src/proto_alpha/lib_protocol/apply_results.mli index 62eec427c99a..ff222b76760b 100644 --- a/src/proto_alpha/lib_protocol/apply_results.mli +++ b/src/proto_alpha/lib_protocol/apply_results.mli @@ -71,7 +71,7 @@ and 'kind contents_result = consensus_key : Signature.public_key_hash; consensus_power : int; } - -> Kind.endorsement contents_result + -> Kind.attestation contents_result | Dal_attestation_result : { delegate : Signature.Public_key_hash.t; } diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 8f42fd3e71c9..cb0bb3f28292 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -37,7 +37,7 @@ module Kind = struct type preattestation = preattestation_consensus_kind consensus - type endorsement = attestation_consensus_kind consensus + type attestation = attestation_consensus_kind consensus type dal_attestation = Dal_attestation_kind @@ -135,7 +135,7 @@ module Kind = struct end type 'a consensus_operation_type = - | Endorsement : Kind.endorsement consensus_operation_type + | Endorsement : Kind.attestation consensus_operation_type | Preendorsement : Kind.preattestation consensus_operation_type type consensus_content = { @@ -235,7 +235,7 @@ and _ contents_list = and _ contents = | Preendorsement : consensus_content -> Kind.preattestation contents - | Endorsement : consensus_content -> Kind.endorsement contents + | Endorsement : consensus_content -> Kind.attestation contents | Dal_attestation : Dal_attestation_repr.operation -> Kind.dal_attestation contents @@ -254,8 +254,8 @@ and _ contents = } -> Kind.double_preendorsement_evidence contents | Double_endorsement_evidence : { - op1 : Kind.endorsement operation; - op2 : Kind.endorsement operation; + op1 : Kind.attestation operation; + op2 : Kind.attestation operation; } -> Kind.double_endorsement_evidence contents | Double_baking_evidence : { @@ -1116,8 +1116,8 @@ module Encoding = struct let make (Case {tag; name; encoding; select = _; proj; inj}) = case (Tag tag) name encoding (fun o -> Some (proj o)) (fun x -> inj x) in - let to_list : Kind.endorsement contents_list -> _ = fun (Single o) -> o in - let of_list : Kind.endorsement contents -> _ = fun o -> Single o in + let to_list : Kind.attestation contents_list -> _ = fun (Single o) -> o in + let of_list : Kind.attestation contents -> _ = fun o -> Single o in def "inlined.endorsement" @@ conv (fun ({shell; protocol_data = {contents; signature}} : _ operation) -> @@ -1138,8 +1138,8 @@ module Encoding = struct let make (Case {tag; name; encoding; select = _; proj; inj}) = case (Tag tag) name encoding (fun o -> Some (proj o)) (fun x -> inj x) in - let to_list : Kind.endorsement contents_list -> _ = fun (Single o) -> o in - let of_list : Kind.endorsement contents -> _ = fun o -> Single o in + let to_list : Kind.attestation contents_list -> _ = fun (Single o) -> o in + let of_list : Kind.attestation contents -> _ = fun o -> Single o in def "inlined.attestation" @@ conv (fun ({shell; protocol_data = {contents; signature}} : _ operation) -> diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 05823e7f08d1..6c2bd505dab6 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -28,7 +28,7 @@ Defines kinds of operations that can be performed on chain: - preattestation - - endorsement + - attestation - double baking evidence - double preendorsing evidence - double endorsing evidence @@ -71,7 +71,7 @@ module Kind : sig type preattestation = preattestation_consensus_kind consensus - type endorsement = attestation_consensus_kind consensus + type attestation = attestation_consensus_kind consensus type dal_attestation = Dal_attestation_kind @@ -169,7 +169,7 @@ module Kind : sig end type 'a consensus_operation_type = - | Endorsement : Kind.endorsement consensus_operation_type + | Endorsement : Kind.attestation consensus_operation_type | Preendorsement : Kind.preattestation consensus_operation_type type consensus_content = { @@ -233,7 +233,7 @@ and _ contents = | Preendorsement : consensus_content -> Kind.preattestation contents (* Endorsement: About consensus, endorsement of a block held by a validator. *) - | Endorsement : consensus_content -> Kind.endorsement contents + | Endorsement : consensus_content -> Kind.attestation contents (* DAL/FIXME https://gitlab.com/tezos/tezos/-/issues/3115 Temporary operation to avoid modifying endorsement encoding. *) @@ -269,8 +269,8 @@ and _ contents = (* Double_endorsement_evidence: Similar to double-preendorsement but for endorsements. *) | Double_endorsement_evidence : { - op1 : Kind.endorsement operation; - op2 : Kind.endorsement operation; + op1 : Kind.attestation operation; + op2 : Kind.attestation operation; } -> Kind.double_endorsement_evidence contents (* Double_baking_evidence: Similarly to double-endorsement but the @@ -673,9 +673,9 @@ module Encoding : sig val preattestation_case : Kind.preattestation case - val endorsement_case : Kind.endorsement case + val endorsement_case : Kind.attestation case - val attestation_case : Kind.endorsement case + val attestation_case : Kind.attestation case val dal_attestation_case : Kind.dal_attestation case diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.mli b/src/proto_alpha/lib_protocol/test/helpers/op.mli index 979b9287d46e..54e017c7f5e2 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/op.mli @@ -51,16 +51,16 @@ val sign : packed_contents_list -> packed_operation -(** Create an unpacked endorsement that is expected for given [Block.t]. +(** Create an unpacked attestation that is expected for given [Block.t]. - Optional parameters allow to specify the endorsed values: [level], + Optional parameters allow to specify the attested values: [level], [round] and/or [block_payload_hash]. - They also allow to specify the endorser ([delegate]), and/or the + They also allow to specify the attester ([delegate]), and/or the [slot]. These default to the first slot and its delegate. Finally, the operation [branch] can be specified. It defaults to the - predecessor of the endorsed block. *) + predecessor of the attested block. *) val raw_endorsement : ?delegate:public_key_hash -> ?slot:Slot.t -> @@ -69,7 +69,7 @@ val raw_endorsement : ?block_payload_hash:Block_payload_hash.t -> ?branch:Block_hash.t -> Block.t -> - Kind.endorsement Operation.t tzresult Lwt.t + Kind.attestation Operation.t tzresult Lwt.t (** Create an unpacked preattestation that is expected for a given [Block.t]. @@ -85,7 +85,7 @@ val raw_preendorsement : Block.t -> Kind.preattestation Operation.t tzresult Lwt.t -(** Create a packed endorsement that is expected for a given +(** Create a packed attestation that is expected for a given [Block.t] by packing the result of {!raw_endorsement}. *) val endorsement : ?delegate:public_key_hash -> @@ -275,8 +275,8 @@ val register_global_constant : val double_endorsement : Context.t -> - Kind.endorsement Operation.t -> - Kind.endorsement Operation.t -> + Kind.attestation Operation.t -> + Kind.attestation Operation.t -> Operation.packed val double_preendorsement : diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml index 3ff8d5803182..9c2bdf022ec8 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml +++ b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.ml @@ -31,7 +31,7 @@ type dbl_endorsement_state = { temporary : (Block.t * Block.t) option; slashable_preend : (Kind.preattestation operation * Kind.preattestation operation) list; - slashable_end : (Kind.endorsement operation * Kind.endorsement operation) list; + slashable_end : (Kind.attestation operation * Kind.attestation operation) list; } type state = { @@ -314,7 +314,7 @@ let seed_nonce_descriptor = List.map_es gen state.seed_nonce_to_reveal); } -(** The heads on which two slashable endorsements or preendorsement +(** The heads on which two slashable attestations or preattestation should be made are from the previous level. Hence, the temporary field of a double_evidence_state is used to transmit them to the next level in order to make the slashable operations. *) @@ -326,15 +326,15 @@ let register_temporary ba bb state : (Block.t * Block.t) option * state = (** During the slashable period, at each level, two different heads for the same round are baked by the same baker. At the next level, - a delegate that either preendorses or endorses both heads makes a - pair of slashable pre- or endorsements. + a delegate that either preattests or attests both heads makes a + pair of slashable pre- or attestations. The pair of heads is placed in the temporary of the double_evidence_state. If a pair of heads was already in this field, hence they were baked at the previous level. - Consequently, two pairs of slashable operations: two endorsements - and two preendorsement, can be made by two distinct endorsers. Each + Consequently, two pairs of slashable operations: two attestations + and two preattestation, can be made by two distinct attestations. Each pair is ordered in operation_hash order. Consequently, each pair can appear in a denunciation operation and will be valid. *) let dbl_endorsement_prelude state = diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli index 239e3361f87d..5bf43d64d9b9 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli +++ b/src/proto_alpha/lib_protocol/test/integration/validate/generator_descriptors.mli @@ -37,7 +37,7 @@ type dbl_endorsement_state = { temporary : (Block.t * Block.t) option; slashable_preend : (Kind.preattestation operation * Kind.preattestation operation) list; - slashable_end : (Kind.endorsement operation * Kind.endorsement operation) list; + slashable_end : (Kind.attestation operation * Kind.attestation operation) list; } (** Generic generation state collecting diff --git a/src/proto_alpha/lib_protocol/validate.ml b/src/proto_alpha/lib_protocol/validate.ml index dda673a9200e..873c1cf63f91 100644 --- a/src/proto_alpha/lib_protocol/validate.ml +++ b/src/proto_alpha/lib_protocol/validate.ml @@ -716,7 +716,7 @@ module Consensus = struct return (consensus_key, voting_power) let check_endorsement vi ~check_signature - (operation : Kind.endorsement operation) = + (operation : Kind.attestation operation) = let open Lwt_result_syntax in let*? consensus_info = Option.value_e @@ -747,7 +747,7 @@ module Consensus = struct in return voting_power - let check_endorsement_conflict vs oph (operation : Kind.endorsement operation) + let check_endorsement_conflict vs oph (operation : Kind.attestation operation) = let (Single (Endorsement {slot; level; round; _})) = operation.protocol_data.contents @@ -768,7 +768,7 @@ module Consensus = struct Validate_errors.Consensus.( Conflicting_consensus_operation {kind = Attestation; conflict}) - let add_endorsement vs oph (op : Kind.endorsement operation) = + let add_endorsement vs oph (op : Kind.attestation operation) = let (Single (Endorsement {slot; level; round; _})) = op.protocol_data.contents in @@ -790,7 +790,7 @@ module Consensus = struct } (* Hypothesis: this function will only be called in mempool mode *) - let remove_endorsement vs (operation : Kind.endorsement operation) = + let remove_endorsement vs (operation : Kind.attestation operation) = (* We do not remove the endorsement power because it is not relevant for the mempool mode. *) let (Single (Endorsement {slot; level; round; _})) = -- GitLab From 2b380656e142050b15f485ff0672aeadb6cfbea7 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Mon, 3 Jul 2023 09:10:06 +0200 Subject: [PATCH 7/8] alpha: rename double_endorsement_evidence kind type --- src/proto_alpha/lib_protocol/alpha_context.mli | 8 ++++---- src/proto_alpha/lib_protocol/apply_results.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.mli | 2 +- src/proto_alpha/lib_protocol/operation_repr.ml | 8 ++++---- src/proto_alpha/lib_protocol/operation_repr.mli | 10 +++++----- src/proto_alpha/lib_protocol/validate.ml | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index f8c04aea51e0..e4061f340007 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4020,7 +4020,7 @@ module Kind : sig type 'a double_consensus_operation_evidence = | Double_consensus_operation_evidence - type double_endorsement_evidence = + type double_attestation_evidence = attestation_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = @@ -4164,7 +4164,7 @@ and _ contents = op1 : Kind.attestation operation; op2 : Kind.attestation operation; } - -> Kind.double_endorsement_evidence contents + -> Kind.double_attestation_evidence contents | Double_baking_evidence : { bh1 : Block_header.t; bh2 : Block_header.t; @@ -4440,9 +4440,9 @@ module Operation : sig val double_preattestation_evidence_case : Kind.double_preendorsement_evidence case - val double_endorsement_evidence_case : Kind.double_endorsement_evidence case + val double_endorsement_evidence_case : Kind.double_attestation_evidence case - val double_attestation_evidence_case : Kind.double_endorsement_evidence case + val double_attestation_evidence_case : Kind.double_attestation_evidence case val double_baking_evidence_case : Kind.double_baking_evidence case diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index db8e12c0524c..97473d669a4b 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -876,7 +876,7 @@ type 'kind contents_result = -> Kind.vdf_revelation contents_result | Double_endorsement_evidence_result : Receipt.balance_updates - -> Kind.double_endorsement_evidence contents_result + -> Kind.double_attestation_evidence contents_result | Double_preendorsement_evidence_result : Receipt.balance_updates -> Kind.double_preendorsement_evidence contents_result diff --git a/src/proto_alpha/lib_protocol/apply_results.mli b/src/proto_alpha/lib_protocol/apply_results.mli index ff222b76760b..e87fa9d8ce8c 100644 --- a/src/proto_alpha/lib_protocol/apply_results.mli +++ b/src/proto_alpha/lib_protocol/apply_results.mli @@ -84,7 +84,7 @@ and 'kind contents_result = -> Kind.vdf_revelation contents_result | Double_endorsement_evidence_result : Receipt.balance_updates - -> Kind.double_endorsement_evidence contents_result + -> Kind.double_attestation_evidence contents_result | Double_preendorsement_evidence_result : Receipt.balance_updates -> Kind.double_preendorsement_evidence contents_result diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index cb0bb3f28292..3321704b7660 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -48,7 +48,7 @@ module Kind = struct type 'a double_consensus_operation_evidence = | Double_consensus_operation_evidence - type double_endorsement_evidence = + type double_attestation_evidence = attestation_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = @@ -257,7 +257,7 @@ and _ contents = op1 : Kind.attestation operation; op2 : Kind.attestation operation; } - -> Kind.double_endorsement_evidence contents + -> Kind.double_attestation_evidence contents | Double_baking_evidence : { bh1 : Block_header_repr.t; bh2 : Block_header_repr.t; @@ -1243,7 +1243,7 @@ module Encoding = struct inj = (fun (op1, op2) -> Double_preendorsement_evidence {op1; op2}); } - let double_endorsement_evidence_case : Kind.double_endorsement_evidence case = + let double_endorsement_evidence_case : Kind.double_attestation_evidence case = Case { tag = 2; @@ -1260,7 +1260,7 @@ module Encoding = struct inj = (fun (op1, op2) -> Double_endorsement_evidence {op1; op2}); } - let double_attestation_evidence_case : Kind.double_endorsement_evidence case = + let double_attestation_evidence_case : Kind.double_attestation_evidence case = Case { tag = 2; diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 6c2bd505dab6..47fd29145e74 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -31,7 +31,7 @@ - attestation - double baking evidence - double preendorsing evidence - - double endorsing evidence + - double attestation evidence - seed nonce revelation - account activation - proposal (see: [Voting_repr]) @@ -82,7 +82,7 @@ module Kind : sig type 'a double_consensus_operation_evidence = | Double_consensus_operation_evidence - type double_endorsement_evidence = + type double_attestation_evidence = attestation_consensus_kind double_consensus_operation_evidence type double_preendorsement_evidence = @@ -272,7 +272,7 @@ and _ contents = op1 : Kind.attestation operation; op2 : Kind.attestation operation; } - -> Kind.double_endorsement_evidence contents + -> Kind.double_attestation_evidence contents (* Double_baking_evidence: Similarly to double-endorsement but the byzantine attempts to fork by signing two different blocks at the same level. *) @@ -689,9 +689,9 @@ module Encoding : sig val double_preattestation_evidence_case : Kind.double_preendorsement_evidence case - val double_endorsement_evidence_case : Kind.double_endorsement_evidence case + val double_endorsement_evidence_case : Kind.double_attestation_evidence case - val double_attestation_evidence_case : Kind.double_endorsement_evidence case + val double_attestation_evidence_case : Kind.double_attestation_evidence case val double_baking_evidence_case : Kind.double_baking_evidence case diff --git a/src/proto_alpha/lib_protocol/validate.ml b/src/proto_alpha/lib_protocol/validate.ml index 873c1cf63f91..6529c252b2e0 100644 --- a/src/proto_alpha/lib_protocol/validate.ml +++ b/src/proto_alpha/lib_protocol/validate.ml @@ -1416,7 +1416,7 @@ module Anonymous = struct op2 let check_double_endorsement_evidence vi - (operation : Kind.double_endorsement_evidence operation) = + (operation : Kind.double_attestation_evidence operation) = let (Single (Double_endorsement_evidence {op1; op2})) = operation.protocol_data.contents in @@ -1443,7 +1443,7 @@ module Anonymous = struct check_double_endorsing_evidence_conflict vs oph op1 let check_double_endorsement_evidence_conflict vs oph - (operation : Kind.double_endorsement_evidence operation) = + (operation : Kind.double_attestation_evidence operation) = let (Single (Double_endorsement_evidence {op1; _})) = operation.protocol_data.contents in @@ -1470,7 +1470,7 @@ module Anonymous = struct } let add_double_endorsement_evidence vs oph - (operation : Kind.double_endorsement_evidence operation) = + (operation : Kind.double_attestation_evidence operation) = let (Single (Double_endorsement_evidence {op1; _})) = operation.protocol_data.contents in @@ -1505,7 +1505,7 @@ module Anonymous = struct remove_double_endorsing_evidence vs op1 let remove_double_endorsement_evidence vs - (operation : Kind.double_endorsement_evidence operation) = + (operation : Kind.double_attestation_evidence operation) = let (Single (Double_endorsement_evidence {op1; _})) = operation.protocol_data.contents in -- GitLab From 1ce5869b558fbef2b0e02ce8499188ffc509f1de Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Mon, 3 Jul 2023 09:16:33 +0200 Subject: [PATCH 8/8] alpha: rename double_preendorsement_evidence kind type --- src/proto_alpha/lib_protocol/alpha_context.mli | 8 ++++---- src/proto_alpha/lib_protocol/apply_results.ml | 2 +- src/proto_alpha/lib_protocol/apply_results.mli | 2 +- src/proto_alpha/lib_protocol/operation_repr.ml | 8 ++++---- src/proto_alpha/lib_protocol/operation_repr.mli | 10 +++++----- src/proto_alpha/lib_protocol/validate.ml | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index e4061f340007..e3ecc5ff833b 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -4023,7 +4023,7 @@ module Kind : sig type double_attestation_evidence = attestation_consensus_kind double_consensus_operation_evidence - type double_preendorsement_evidence = + type double_preattestation_evidence = preattestation_consensus_kind double_consensus_operation_evidence type double_baking_evidence = Double_baking_evidence_kind @@ -4159,7 +4159,7 @@ and _ contents = op1 : Kind.preattestation operation; op2 : Kind.preattestation operation; } - -> Kind.double_preendorsement_evidence contents + -> Kind.double_preattestation_evidence contents | Double_endorsement_evidence : { op1 : Kind.attestation operation; op2 : Kind.attestation operation; @@ -4435,10 +4435,10 @@ module Operation : sig val vdf_revelation_case : Kind.vdf_revelation case val double_preendorsement_evidence_case : - Kind.double_preendorsement_evidence case + Kind.double_preattestation_evidence case val double_preattestation_evidence_case : - Kind.double_preendorsement_evidence case + Kind.double_preattestation_evidence case val double_endorsement_evidence_case : Kind.double_attestation_evidence case diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index 97473d669a4b..8e3c3148090d 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -879,7 +879,7 @@ type 'kind contents_result = -> Kind.double_attestation_evidence contents_result | Double_preendorsement_evidence_result : Receipt.balance_updates - -> Kind.double_preendorsement_evidence contents_result + -> Kind.double_preattestation_evidence contents_result | Double_baking_evidence_result : Receipt.balance_updates -> Kind.double_baking_evidence contents_result diff --git a/src/proto_alpha/lib_protocol/apply_results.mli b/src/proto_alpha/lib_protocol/apply_results.mli index e87fa9d8ce8c..09bb74fa7ed8 100644 --- a/src/proto_alpha/lib_protocol/apply_results.mli +++ b/src/proto_alpha/lib_protocol/apply_results.mli @@ -87,7 +87,7 @@ and 'kind contents_result = -> Kind.double_attestation_evidence contents_result | Double_preendorsement_evidence_result : Receipt.balance_updates - -> Kind.double_preendorsement_evidence contents_result + -> Kind.double_preattestation_evidence contents_result | Double_baking_evidence_result : Receipt.balance_updates -> Kind.double_baking_evidence contents_result diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index 3321704b7660..bcc30c07a45c 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -51,7 +51,7 @@ module Kind = struct type double_attestation_evidence = attestation_consensus_kind double_consensus_operation_evidence - type double_preendorsement_evidence = + type double_preattestation_evidence = preattestation_consensus_kind double_consensus_operation_evidence type double_baking_evidence = Double_baking_evidence_kind @@ -252,7 +252,7 @@ and _ contents = op1 : Kind.preattestation operation; op2 : Kind.preattestation operation; } - -> Kind.double_preendorsement_evidence contents + -> Kind.double_preattestation_evidence contents | Double_endorsement_evidence : { op1 : Kind.attestation operation; op2 : Kind.attestation operation; @@ -1208,7 +1208,7 @@ module Encoding = struct } let double_preendorsement_evidence_case : - Kind.double_preendorsement_evidence case = + Kind.double_preattestation_evidence case = Case { tag = 7; @@ -1226,7 +1226,7 @@ module Encoding = struct } let double_preattestation_evidence_case : - Kind.double_preendorsement_evidence case = + Kind.double_preattestation_evidence case = Case { tag = 7; diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 47fd29145e74..6198049308b8 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -30,7 +30,7 @@ - preattestation - attestation - double baking evidence - - double preendorsing evidence + - double preattestation evidence - double attestation evidence - seed nonce revelation - account activation @@ -85,7 +85,7 @@ module Kind : sig type double_attestation_evidence = attestation_consensus_kind double_consensus_operation_evidence - type double_preendorsement_evidence = + type double_preattestation_evidence = preattestation_consensus_kind double_consensus_operation_evidence type double_baking_evidence = Double_baking_evidence_kind @@ -265,7 +265,7 @@ and _ contents = op1 : Kind.preattestation operation; op2 : Kind.preattestation operation; } - -> Kind.double_preendorsement_evidence contents + -> Kind.double_preattestation_evidence contents (* Double_endorsement_evidence: Similar to double-preendorsement but for endorsements. *) | Double_endorsement_evidence : { @@ -684,10 +684,10 @@ module Encoding : sig val vdf_revelation_case : Kind.vdf_revelation case val double_preendorsement_evidence_case : - Kind.double_preendorsement_evidence case + Kind.double_preattestation_evidence case val double_preattestation_evidence_case : - Kind.double_preendorsement_evidence case + Kind.double_preattestation_evidence case val double_endorsement_evidence_case : Kind.double_attestation_evidence case diff --git a/src/proto_alpha/lib_protocol/validate.ml b/src/proto_alpha/lib_protocol/validate.ml index 6529c252b2e0..57ac60568147 100644 --- a/src/proto_alpha/lib_protocol/validate.ml +++ b/src/proto_alpha/lib_protocol/validate.ml @@ -1405,7 +1405,7 @@ module Anonymous = struct return_unit let check_double_preendorsement_evidence vi - (operation : Kind.double_preendorsement_evidence operation) = + (operation : Kind.double_preattestation_evidence operation) = let (Single (Double_preendorsement_evidence {op1; op2})) = operation.protocol_data.contents in @@ -1436,7 +1436,7 @@ module Anonymous = struct Error (Operation_conflict {existing; new_operation = oph})) let check_double_preendorsement_evidence_conflict vs oph - (operation : Kind.double_preendorsement_evidence operation) = + (operation : Kind.double_preattestation_evidence operation) = let (Single (Double_preendorsement_evidence {op1; _})) = operation.protocol_data.contents in @@ -1477,7 +1477,7 @@ module Anonymous = struct add_double_endorsing_evidence vs oph op1 let add_double_preendorsement_evidence vs oph - (operation : Kind.double_preendorsement_evidence operation) = + (operation : Kind.double_preattestation_evidence operation) = let (Single (Double_preendorsement_evidence {op1; _})) = operation.protocol_data.contents in @@ -1498,7 +1498,7 @@ module Anonymous = struct {vs with anonymous_state} let remove_double_preendorsement_evidence vs - (operation : Kind.double_preendorsement_evidence operation) = + (operation : Kind.double_preattestation_evidence operation) = let (Single (Double_preendorsement_evidence {op1; _})) = operation.protocol_data.contents in -- GitLab