diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index 1e4c5757e..bf8f4ff68 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -300,15 +300,13 @@ let rec pp_contents_and_result_list : Ed25519.Public_key_hash.pp id pp_balance_updates bus | Single_and_result - (Endorsement { block ; level }, + (Endorsement { level }, Endorsement_result (delegate, slots)) -> Format.fprintf ppf "@[Endorsement:@,\ - Block: %a@,\ Level: %a@,\ Delegate: %a@,\ Slots: %a@]" - Block_hash.pp block Raw_level.pp level Signature.Public_key_hash.pp delegate (Format.pp_print_list diff --git a/src/proto_alpha/lib_delegate/test/proto_alpha_helpers.ml b/src/proto_alpha/lib_delegate/test/proto_alpha_helpers.ml index 9f91e2fa5..a02a0609f 100644 --- a/src/proto_alpha/lib_delegate/test/proto_alpha_helpers.ml +++ b/src/proto_alpha/lib_delegate/test/proto_alpha_helpers.ml @@ -554,7 +554,7 @@ module Endorse = struct let level = level.level in let shell = { Tezos_base.Operation.branch = hash } in let contents = - Single (Endorsement { block = hash ; level }) in + Single (Endorsement { level }) in sign ~watermark:Endorsement src_sk shell (Contents_list contents) let signing_slots diff --git a/src/proto_alpha/lib_protocol/src/alpha_context.mli b/src/proto_alpha/lib_protocol/src/alpha_context.mli index 8ff42b23e..d1f3ffa4c 100644 --- a/src/proto_alpha/lib_protocol/src/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/src/alpha_context.mli @@ -803,7 +803,6 @@ and _ contents_list = and _ contents = | Endorsement : { - block: Block_hash.t ; level: Raw_level.t ; } -> Kind.endorsement contents | Seed_nonce_revelation : { diff --git a/src/proto_alpha/lib_protocol/src/apply.ml b/src/proto_alpha/lib_protocol/src/apply.ml index 9b5d8f5ce..744e6a4b2 100644 --- a/src/proto_alpha/lib_protocol/src/apply.ml +++ b/src/proto_alpha/lib_protocol/src/apply.ml @@ -608,10 +608,7 @@ let apply_contents_list (contents_list : kind contents_list) : (context * kind contents_result_list) tzresult Lwt.t = match contents_list with - | Single (Endorsement { block ; level }) -> - fail_unless - (Block_hash.equal block pred_block) - (Wrong_endorsement_predecessor (pred_block, block)) >>=? fun () -> + | Single (Endorsement { level }) -> let block = operation.shell.branch in fail_unless (Block_hash.equal block pred_block) @@ -646,7 +643,7 @@ let apply_contents_list | Single (Endorsement e1), Single (Endorsement e2) when Raw_level.(e1.level = e2.level) && - not (Block_hash.equal e1.block e2.block) -> + not (Block_hash.equal op1.shell.branch op2.shell.branch) -> let level = Level.from_raw ctxt e1.level in let oldest_level = Level.last_allowed_fork_level ctxt in fail_unless Level.(level < Level.current ctxt) diff --git a/src/proto_alpha/lib_protocol/src/helpers_services.ml b/src/proto_alpha/lib_protocol/src/helpers_services.ml index b82b7f8a0..fd7106095 100644 --- a/src/proto_alpha/lib_protocol/src/helpers_services.ml +++ b/src/proto_alpha/lib_protocol/src/helpers_services.ml @@ -390,9 +390,9 @@ module Forge = struct () ({ branch }, Contents_list (Single operation)) let endorsement ctxt - b ~branch ~block ~level () = + b ~branch ~level () = operation ctxt b ~branch - (Endorsement { block ; level }) + (Endorsement { level }) let proposals ctxt b ~branch ~source ~period ~proposals () = diff --git a/src/proto_alpha/lib_protocol/src/helpers_services.mli b/src/proto_alpha/lib_protocol/src/helpers_services.mli index 93a0d0067..6445583d3 100644 --- a/src/proto_alpha/lib_protocol/src/helpers_services.mli +++ b/src/proto_alpha/lib_protocol/src/helpers_services.mli @@ -129,7 +129,6 @@ module Forge : sig val endorsement: 'a #RPC_context.simple -> 'a -> branch:Block_hash.t -> - block:Block_hash.t -> level:Raw_level.t -> unit -> MBytes.t shell_tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/src/operation_repr.ml b/src/proto_alpha/lib_protocol/src/operation_repr.ml index 1be4d3142..9ed1d08ab 100644 --- a/src/proto_alpha/lib_protocol/src/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/src/operation_repr.ml @@ -52,7 +52,6 @@ and _ contents_list = and _ contents = | Endorsement : { - block: Block_hash.t ; level: Raw_level_repr.t ; } -> Kind.endorsement contents | Seed_nonce_revelation : { @@ -305,8 +304,7 @@ module Encoding = struct inj: 'a -> 'b contents } -> 'b case let endorsement_encoding = - obj2 - (req "block" Block_hash.encoding) + obj1 (req "level" Raw_level_repr.encoding) let endorsement_case = @@ -319,9 +317,9 @@ module Encoding = struct | Contents (Endorsement _ as op) -> Some op | _ -> None) ; proj = - (fun (Endorsement { block ; level }) -> (block, level)) ; + (fun (Endorsement { level }) -> level) ; inj = - (fun (block, level) -> Endorsement { block ; level }) + (fun level -> Endorsement { level }) } let endorsement_encoding = diff --git a/src/proto_alpha/lib_protocol/src/operation_repr.mli b/src/proto_alpha/lib_protocol/src/operation_repr.mli index 8589afd7c..2711c41a2 100644 --- a/src/proto_alpha/lib_protocol/src/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/src/operation_repr.mli @@ -53,7 +53,6 @@ and _ contents_list = and _ contents = | Endorsement : { - block: Block_hash.t ; level: Raw_level_repr.t ; } -> Kind.endorsement contents | Seed_nonce_revelation : { diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.ml b/src/proto_alpha/lib_protocol/test/helpers/op.ml index 7ebed2fea..a788aa2b9 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/op.ml @@ -39,10 +39,7 @@ let endorsement ?delegate ?level ctxt ?(signing_context = ctxt) () = | None -> Context.get_level ctxt | Some level -> return level end >>=? fun level -> - let op = - Single - (Endorsement - { block = Context.branch ctxt ; level }) in + let op = Single (Endorsement { level }) in return (sign ~watermark:Signature.Endorsement delegate.sk signing_context op) let sign ?watermark sk ctxt (Contents_list contents) =