From c2635696c038de13edd2f5773aa9f2fe16b69359 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Thu, 30 Jun 2022 15:48:04 +0200 Subject: [PATCH 1/2] Proto-env: include camlInternalFormatBasic --- manifest/main.ml | 2 - src/lib_protocol_compiler/dune | 1 - .../environment_V0.ml | 1 + .../environment_V1.ml | 1 + .../environment_V2.ml | 1 + .../environment_V3.ml | 1 + .../environment_V4.ml | 1 + .../environment_V5.ml | 1 + .../environment_V6.ml | 1 + .../environment_V7.ml | 1 + src/lib_protocol_environment/sigs/v0.in.ml | 6 +- src/lib_protocol_environment/sigs/v0.ml | 98 ++++++------- src/lib_protocol_environment/sigs/v1.in.ml | 6 +- src/lib_protocol_environment/sigs/v1.ml | 110 +++++++------- src/lib_protocol_environment/sigs/v2.in.ml | 6 +- src/lib_protocol_environment/sigs/v2.ml | 116 +++++++-------- src/lib_protocol_environment/sigs/v3.in.ml | 6 +- src/lib_protocol_environment/sigs/v3.ml | 120 ++++++++-------- src/lib_protocol_environment/sigs/v4.in.ml | 6 +- src/lib_protocol_environment/sigs/v4.ml | 122 ++++++++-------- src/lib_protocol_environment/sigs/v5.in.ml | 6 +- src/lib_protocol_environment/sigs/v5.ml | 126 ++++++++-------- src/lib_protocol_environment/sigs/v6.in.ml | 6 +- src/lib_protocol_environment/sigs/v6.ml | 132 ++++++++--------- src/lib_protocol_environment/sigs/v7.in.ml | 6 +- src/lib_protocol_environment/sigs/v7.ml | 134 +++++++++--------- src/proto_000_Ps9mPmXa/lib_protocol/dune | 2 +- src/proto_001_PtCJ7pwo/lib_protocol/dune | 2 +- src/proto_002_PsYLVpVv/lib_protocol/dune | 2 +- src/proto_003_PsddFKi3/lib_protocol/dune | 2 +- src/proto_004_Pt24m4xi/lib_protocol/dune | 2 +- src/proto_005_PsBABY5H/lib_protocol/dune | 2 +- src/proto_005_PsBabyM1/lib_protocol/dune | 2 +- src/proto_006_PsCARTHA/lib_protocol/dune | 2 +- src/proto_007_PsDELPH1/lib_protocol/dune | 2 +- src/proto_008_PtEdo2Zk/lib_protocol/dune | 2 +- src/proto_008_PtEdoTez/lib_protocol/dune | 2 +- src/proto_009_PsFLoren/lib_protocol/dune | 2 +- src/proto_010_PtGRANAD/lib_protocol/dune | 2 +- src/proto_011_PtHangz2/lib_protocol/dune | 2 +- src/proto_012_Psithaca/lib_protocol/dune | 2 +- src/proto_013_PtJakart/lib_protocol/dune | 2 +- src/proto_014_PtKathma/lib_protocol/dune | 2 +- src/proto_alpha/lib_protocol/dune | 2 +- src/proto_demo_counter/lib_protocol/dune | 2 +- src/proto_demo_noops/lib_protocol/dune | 2 +- src/proto_genesis/lib_protocol/dune | 2 +- 47 files changed, 548 insertions(+), 511 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index e64c14dc0eb9..2192e6bb8203 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2000,7 +2000,6 @@ let octez_protocol_compiler_lib = S "-o"; S "%{targets}"; ]; - S "%{lib:stdlib:camlinternalFormatBasics.cmi}"; S "%{lib:tezos-protocol-environment.sigs-internals:tezos_protocol_environment_sigs_internals.cmi}"; S @@ -3592,7 +3591,6 @@ end = struct (sf {|module Name = struct let name = "%s" end include Tezos_protocol_environment.V%d.Make(Name)() -module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end |} name_dash tezos_protocol.expected_env_version); diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 815f7facf620..d5a21cb7145f 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -27,7 +27,6 @@ (action (run %{bin:ocp-ocamlres} -format variants -o %{targets} - %{lib:stdlib:camlinternalFormatBasics.cmi} %{lib:tezos-protocol-environment.sigs-internals:tezos_protocol_environment_sigs_internals.cmi} %{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmi} %{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs__V0.cmi} diff --git a/src/lib_protocol_environment/environment_V0.ml b/src/lib_protocol_environment/environment_V0.ml index 4332005a6863..17d0152a5438 100644 --- a/src/lib_protocol_environment/environment_V0.ml +++ b/src/lib_protocol_environment/environment_V0.ml @@ -103,6 +103,7 @@ module Make (Param : sig end) () = struct + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib (* The modules provided in the [_struct.V0.M] pack are meant specifically to diff --git a/src/lib_protocol_environment/environment_V1.ml b/src/lib_protocol_environment/environment_V1.ml index b3fd5f80b628..1be710e6eed3 100644 --- a/src/lib_protocol_environment/environment_V1.ml +++ b/src/lib_protocol_environment/environment_V1.ml @@ -110,6 +110,7 @@ module Make (Param : sig end) () = struct + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib (* The modules provided in the [_struct.V1.M] pack are meant specifically to diff --git a/src/lib_protocol_environment/environment_V2.ml b/src/lib_protocol_environment/environment_V2.ml index ed59a9318553..e4f8073db454 100644 --- a/src/lib_protocol_environment/environment_V2.ml +++ b/src/lib_protocol_environment/environment_V2.ml @@ -115,6 +115,7 @@ module Make (Param : sig end) () = struct + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib (* The modules provided in the [_struct.V2.M] pack are meant specifically to diff --git a/src/lib_protocol_environment/environment_V3.ml b/src/lib_protocol_environment/environment_V3.ml index b735e13077e9..892fd72546b6 100644 --- a/src/lib_protocol_environment/environment_V3.ml +++ b/src/lib_protocol_environment/environment_V3.ml @@ -136,6 +136,7 @@ struct n ; Stdlib.exit 1 + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib (* The modules provided in the [_struct.V3.M] pack are meant specifically to diff --git a/src/lib_protocol_environment/environment_V4.ml b/src/lib_protocol_environment/environment_V4.ml index 475305b39df9..9c8d0e2cb9a9 100644 --- a/src/lib_protocol_environment/environment_V4.ml +++ b/src/lib_protocol_environment/environment_V4.ml @@ -142,6 +142,7 @@ struct n ; Stdlib.exit 1 + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib module Pervasives = Stdlib diff --git a/src/lib_protocol_environment/environment_V5.ml b/src/lib_protocol_environment/environment_V5.ml index 8950322f8189..dcc46ba46c28 100644 --- a/src/lib_protocol_environment/environment_V5.ml +++ b/src/lib_protocol_environment/environment_V5.ml @@ -149,6 +149,7 @@ struct n ; Stdlib.exit 1 + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib module Pervasives = Stdlib diff --git a/src/lib_protocol_environment/environment_V6.ml b/src/lib_protocol_environment/environment_V6.ml index fdac312c8839..76353e57d065 100644 --- a/src/lib_protocol_environment/environment_V6.ml +++ b/src/lib_protocol_environment/environment_V6.ml @@ -154,6 +154,7 @@ struct n ; Stdlib.exit 1 + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib module Pervasives = Stdlib diff --git a/src/lib_protocol_environment/environment_V7.ml b/src/lib_protocol_environment/environment_V7.ml index 1ed55aee8985..d4c8a061d97a 100644 --- a/src/lib_protocol_environment/environment_V7.ml +++ b/src/lib_protocol_environment/environment_V7.ml @@ -154,6 +154,7 @@ struct n ; Stdlib.exit 1 + module CamlinternalFormatBasics = CamlinternalFormatBasics include Stdlib module Pervasives = Stdlib diff --git a/src/lib_protocol_environment/sigs/v0.in.ml b/src/lib_protocol_environment/sigs/v0.in.ml index cbdede08a78f..6cac47bd18cc 100644 --- a/src/lib_protocol_environment/sigs/v0.in.ml +++ b/src/lib_protocol_environment/sigs/v0.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v0/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v0.ml b/src/lib_protocol_environment/sigs/v0.ml index 0634a006be9b..369c20f4c9d5 100644 --- a/src/lib_protocol_environment/sigs/v0.ml +++ b/src/lib_protocol_environment/sigs/v0.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v0.in.ml instead. *) # 1 "v0.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v0/pervasives.mli" (**************************************************************************) @@ -479,7 +481,7 @@ val ( ^^ ) : ('f, 'b, 'c, 'e, 'g, 'h) format6 -> ('a, 'b, 'c, 'd, 'g, 'h) format6 end -# 4 "v0.in.ml" +# 6 "v0.in.ml" open Pervasives @@ -796,7 +798,7 @@ val sort_uniq : ('a -> 'a -> int) -> 'a list -> 'a list *) val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list end -# 8 "v0.in.ml" +# 10 "v0.in.ml" module String : sig @@ -1100,7 +1102,7 @@ module LE : sig val get_int64 : t -> int -> int64 end end -# 10 "v0.in.ml" +# 12 "v0.in.ml" module Int32 : sig @@ -1291,7 +1293,7 @@ val compare : t -> t -> int @since 4.03.0 *) val equal : t -> t -> bool end -# 12 "v0.in.ml" +# 14 "v0.in.ml" module Int64 : sig @@ -1503,7 +1505,7 @@ val compare : t -> t -> int @since 4.03.0 *) val equal : t -> t -> bool end -# 14 "v0.in.ml" +# 16 "v0.in.ml" module Format : sig @@ -2146,7 +2148,7 @@ val ksprintf : (string -> 'a) -> ('b, unit, string, 'a) format4 -> 'b *) val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b end -# 16 "v0.in.ml" +# 18 "v0.in.ml" module MBytes : sig @@ -2302,7 +2304,7 @@ val to_hex : t -> [`Hex of string] val of_hex : [`Hex of string] -> t end -# 18 "v0.in.ml" +# 20 "v0.in.ml" module Z : sig @@ -2434,7 +2436,7 @@ val compare : t -> t -> int for negative arguments, and that [numbits (-x) = numbits x]. *) val numbits : t -> int end -# 20 "v0.in.ml" +# 22 "v0.in.ml" module Lwt : sig @@ -2908,7 +2910,7 @@ val ( <&> ) : unit t -> unit t -> unit t (* val backtrace_try_bind : (exn -> exn) -> (unit -> 'a t) -> ('a -> 'b t) -> (exn -> 'b t) -> 'b t *) (* val backtrace_finalize : (exn -> exn) -> (unit -> 'a t) -> (unit -> unit t) -> 'a t *) end -# 22 "v0.in.ml" +# 24 "v0.in.ml" module Lwt_list : sig @@ -2990,7 +2992,7 @@ val partition_s : ('a -> bool Lwt.t) -> 'a list -> ('a list * 'a list) Lwt.t val partition_p : ('a -> bool Lwt.t) -> 'a list -> ('a list * 'a list) Lwt.t end -# 24 "v0.in.ml" +# 26 "v0.in.ml" module Raw_hashes : sig @@ -3026,7 +3028,7 @@ val sha256 : MBytes.t -> MBytes.t val sha512 : MBytes.t -> MBytes.t end -# 26 "v0.in.ml" +# 28 "v0.in.ml" module Compare : sig @@ -3112,7 +3114,7 @@ module List (P : COMPARABLE) : S with type t = P.t list module Option (P : COMPARABLE) : S with type t = P.t option end -# 28 "v0.in.ml" +# 30 "v0.in.ml" module Data_encoding : sig @@ -3541,7 +3543,7 @@ end the JSON encoding. *) val check_size : int -> 'a encoding -> 'a encoding end -# 30 "v0.in.ml" +# 32 "v0.in.ml" module Error_monad : sig @@ -3742,7 +3744,7 @@ type shell_error type 'a shell_tzresult = ('a, shell_error list) result end -# 32 "v0.in.ml" +# 34 "v0.in.ml" open Error_monad @@ -3796,7 +3798,7 @@ val lwt_warn : ('a, Format.formatter, unit, unit Lwt.t) format4 -> 'a val lwt_log_error : ('a, Format.formatter, unit, unit Lwt.t) format4 -> 'a end -# 36 "v0.in.ml" +# 38 "v0.in.ml" module Time : sig @@ -3850,7 +3852,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 38 "v0.in.ml" +# 40 "v0.in.ml" module Option : sig @@ -3896,7 +3898,7 @@ val try_with : (unit -> 'a) -> 'a option val some : 'a -> 'a option end -# 40 "v0.in.ml" +# 42 "v0.in.ml" module RPC_arg : sig @@ -3958,7 +3960,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 42 "v0.in.ml" +# 44 "v0.in.ml" module RPC_path : sig @@ -4014,7 +4016,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 44 "v0.in.ml" +# 46 "v0.in.ml" module RPC_query : sig @@ -4086,7 +4088,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 46 "v0.in.ml" +# 48 "v0.in.ml" module RPC_service : sig @@ -4163,7 +4165,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 48 "v0.in.ml" +# 50 "v0.in.ml" module RPC_answer : sig @@ -4215,7 +4217,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 50 "v0.in.ml" +# 52 "v0.in.ml" module RPC_directory : sig @@ -4454,7 +4456,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 52 "v0.in.ml" +# 54 "v0.in.ml" module Base58 : sig @@ -4504,7 +4506,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit val decode : string -> data option end -# 54 "v0.in.ml" +# 56 "v0.in.ml" module S : sig @@ -4864,7 +4866,7 @@ module type SIGNATURE = sig val check : ?watermark:watermark -> Public_key.t -> t -> MBytes.t -> bool end end -# 56 "v0.in.ml" +# 58 "v0.in.ml" module Set : sig @@ -4934,7 +4936,7 @@ end given a totally ordered type. *) module Make (Ord : OrderedType) : S.SET with type elt = Ord.t end -# 58 "v0.in.ml" +# 60 "v0.in.ml" module Map : sig @@ -5003,7 +5005,7 @@ end given a totally ordered type. *) module Make (Ord : OrderedType) : S.MAP with type key = Ord.t end -# 60 "v0.in.ml" +# 62 "v0.in.ml" module Blake2B : sig @@ -5066,7 +5068,7 @@ module Make (Register : sig end) (Name : PrefixedName) : S.HASH end -# 62 "v0.in.ml" +# 64 "v0.in.ml" module Ed25519 : sig @@ -5100,7 +5102,7 @@ end include S.SIGNATURE with type watermark := MBytes.t end -# 64 "v0.in.ml" +# 66 "v0.in.ml" module Secp256k1 : sig @@ -5134,7 +5136,7 @@ end include S.SIGNATURE with type watermark := MBytes.t end -# 66 "v0.in.ml" +# 68 "v0.in.ml" module P256 : sig @@ -5168,7 +5170,7 @@ end include S.SIGNATURE with type watermark := MBytes.t end -# 68 "v0.in.ml" +# 70 "v0.in.ml" module Chain_id : sig @@ -5200,7 +5202,7 @@ end include S.HASH end -# 70 "v0.in.ml" +# 72 "v0.in.ml" module Signature : sig @@ -5252,7 +5254,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 72 "v0.in.ml" +# 74 "v0.in.ml" module Block_hash : sig @@ -5285,7 +5287,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 74 "v0.in.ml" +# 76 "v0.in.ml" module Operation_hash : sig @@ -5318,7 +5320,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 76 "v0.in.ml" +# 78 "v0.in.ml" module Operation_list_hash : sig @@ -5351,7 +5353,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 78 "v0.in.ml" +# 80 "v0.in.ml" module Operation_list_list_hash : sig @@ -5384,7 +5386,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 80 "v0.in.ml" +# 82 "v0.in.ml" module Protocol_hash : sig @@ -5417,7 +5419,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 82 "v0.in.ml" +# 84 "v0.in.ml" module Context_hash : sig @@ -5450,7 +5452,7 @@ end (** Committed context hashes / IDs. *) include S.HASH end -# 84 "v0.in.ml" +# 86 "v0.in.ml" module Micheline : sig @@ -5523,7 +5525,7 @@ val extract_locations : val inject_locations : (canonical_location -> 'l) -> 'p canonical -> ('l, 'p) node end -# 86 "v0.in.ml" +# 88 "v0.in.ml" module Block_header : sig @@ -5574,7 +5576,7 @@ type t = {shell : shell_header; protocol_data : MBytes.t} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 88 "v0.in.ml" +# 90 "v0.in.ml" module Fitness : sig @@ -5608,7 +5610,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = MBytes.t list end -# 90 "v0.in.ml" +# 92 "v0.in.ml" module Operation : sig @@ -5652,7 +5654,7 @@ type t = {shell : shell_header; proto : MBytes.t} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 92 "v0.in.ml" +# 94 "v0.in.ml" module Context : sig @@ -5724,7 +5726,7 @@ val register_resolver : val complete : t -> string -> string list Lwt.t end -# 94 "v0.in.ml" +# 96 "v0.in.ml" module Updater : sig @@ -5965,7 +5967,7 @@ val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t val fork_test_chain : Context.t -> protocol:Protocol_hash.t -> expiration:Time.t -> Context.t Lwt.t end -# 96 "v0.in.ml" +# 98 "v0.in.ml" module RPC_context : sig @@ -6120,6 +6122,6 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 98 "v0.in.ml" +# 100 "v0.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v1.in.ml b/src/lib_protocol_environment/sigs/v1.in.ml index c5f8d3885723..12545aa8e315 100644 --- a/src/lib_protocol_environment/sigs/v1.in.ml +++ b/src/lib_protocol_environment/sigs/v1.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v1/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v1.ml b/src/lib_protocol_environment/sigs/v1.ml index 93a3dae832a5..901bc8de39a4 100644 --- a/src/lib_protocol_environment/sigs/v1.ml +++ b/src/lib_protocol_environment/sigs/v1.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v1.in.ml instead. *) # 1 "v1.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v1/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v1.in.ml" +# 6 "v1.in.ml" open Pervasives @@ -787,7 +789,7 @@ val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list Not tail-recursive (sum of the lengths of the arguments). *) end -# 8 "v1.in.ml" +# 10 "v1.in.ml" module String : sig @@ -1035,7 +1037,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 10 "v1.in.ml" +# 12 "v1.in.ml" module Char : sig @@ -1095,7 +1097,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 12 "v1.in.ml" +# 14 "v1.in.ml" module Bytes : sig @@ -1361,7 +1363,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 *) end -# 14 "v1.in.ml" +# 16 "v1.in.ml" module Int32 : sig @@ -1511,7 +1513,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 16 "v1.in.ml" +# 18 "v1.in.ml" module Int64 : sig @@ -1669,7 +1671,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 18 "v1.in.ml" +# 20 "v1.in.ml" module Format : sig @@ -2422,7 +2424,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 20 "v1.in.ml" +# 22 "v1.in.ml" module Hex : sig @@ -2501,7 +2503,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 22 "v1.in.ml" +# 24 "v1.in.ml" module Z : sig @@ -2975,7 +2977,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 24 "v1.in.ml" +# 26 "v1.in.ml" module Lwt : sig @@ -3246,7 +3248,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 26 "v1.in.ml" +# 28 "v1.in.ml" module Lwt_list : sig @@ -3293,7 +3295,7 @@ val filter_map_s : ('a -> 'b option Lwt.t) -> 'a list -> 'b list Lwt.t val partition_s : ('a -> bool Lwt.t) -> 'a list -> ('a list * 'a list) Lwt.t end -# 28 "v1.in.ml" +# 30 "v1.in.ml" module Data_encoding : sig @@ -3722,7 +3724,7 @@ end the JSON encoding. *) val check_size : int -> 'a encoding -> 'a encoding end -# 30 "v1.in.ml" +# 32 "v1.in.ml" module Raw_hashes : sig @@ -3764,7 +3766,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 32 "v1.in.ml" +# 34 "v1.in.ml" module Compare : sig @@ -3850,7 +3852,7 @@ module List (P : COMPARABLE) : S with type t = P.t list module Option (P : COMPARABLE) : S with type t = P.t option end -# 34 "v1.in.ml" +# 36 "v1.in.ml" module Error_monad : sig @@ -4119,7 +4121,7 @@ type shell_error type 'a shell_tzresult = ('a, shell_error list) result end -# 36 "v1.in.ml" +# 38 "v1.in.ml" open Error_monad @@ -4173,7 +4175,7 @@ val lwt_warn : ('a, Format.formatter, unit, unit Lwt.t) format4 -> 'a val lwt_log_error : ('a, Format.formatter, unit, unit Lwt.t) format4 -> 'a end -# 40 "v1.in.ml" +# 42 "v1.in.ml" module Time : sig @@ -4227,7 +4229,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 42 "v1.in.ml" +# 44 "v1.in.ml" module Option : sig @@ -4353,7 +4355,7 @@ val pp : 'a option -> unit end -# 44 "v1.in.ml" +# 46 "v1.in.ml" module TzEndian : sig @@ -4403,7 +4405,7 @@ val get_uint8 : bytes -> int -> int val get_uint16 : bytes -> int -> int end -# 46 "v1.in.ml" +# 48 "v1.in.ml" module RPC_arg : sig @@ -4465,7 +4467,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 48 "v1.in.ml" +# 50 "v1.in.ml" module RPC_path : sig @@ -4521,7 +4523,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 50 "v1.in.ml" +# 52 "v1.in.ml" module RPC_query : sig @@ -4593,7 +4595,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 52 "v1.in.ml" +# 54 "v1.in.ml" module RPC_service : sig @@ -4670,7 +4672,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 54 "v1.in.ml" +# 56 "v1.in.ml" module RPC_answer : sig @@ -4722,7 +4724,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 56 "v1.in.ml" +# 58 "v1.in.ml" module RPC_directory : sig @@ -4961,7 +4963,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 58 "v1.in.ml" +# 60 "v1.in.ml" module Base58 : sig @@ -5011,7 +5013,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit val decode : string -> data option end -# 60 "v1.in.ml" +# 62 "v1.in.ml" module S : sig @@ -5810,7 +5812,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 62 "v1.in.ml" +# 64 "v1.in.ml" module Set : sig @@ -5881,7 +5883,7 @@ module Make (Ord : OrderedType) : S.SET with type elt = Ord.t (** Functor building an implementation of the set structure given a totally ordered type. *) end -# 64 "v1.in.ml" +# 66 "v1.in.ml" module Map : sig @@ -5951,7 +5953,7 @@ module Make (Ord : OrderedType) : S.MAP with type key = Ord.t (** Functor building an implementation of the map structure given a totally ordered type. *) end -# 66 "v1.in.ml" +# 68 "v1.in.ml" module Blake2B : sig @@ -6015,7 +6017,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 68 "v1.in.ml" +# 70 "v1.in.ml" module Bls12_381 : sig @@ -6055,7 +6057,7 @@ include and type G1.Scalar.t = Fr.t and type G2.Scalar.t = Fr.t end -# 70 "v1.in.ml" +# 72 "v1.in.ml" module Ed25519 : sig @@ -6089,7 +6091,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 72 "v1.in.ml" +# 74 "v1.in.ml" module Secp256k1 : sig @@ -6123,7 +6125,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 74 "v1.in.ml" +# 76 "v1.in.ml" module P256 : sig @@ -6157,7 +6159,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 76 "v1.in.ml" +# 78 "v1.in.ml" module Chain_id : sig @@ -6189,7 +6191,7 @@ end include S.HASH end -# 78 "v1.in.ml" +# 80 "v1.in.ml" module Signature : sig @@ -6241,7 +6243,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 80 "v1.in.ml" +# 82 "v1.in.ml" module Block_hash : sig @@ -6274,7 +6276,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 82 "v1.in.ml" +# 84 "v1.in.ml" module Operation_hash : sig @@ -6307,7 +6309,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 84 "v1.in.ml" +# 86 "v1.in.ml" module Operation_list_hash : sig @@ -6340,7 +6342,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 86 "v1.in.ml" +# 88 "v1.in.ml" module Operation_list_list_hash : sig @@ -6373,7 +6375,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 88 "v1.in.ml" +# 90 "v1.in.ml" module Protocol_hash : sig @@ -6406,7 +6408,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 90 "v1.in.ml" +# 92 "v1.in.ml" module Context_hash : sig @@ -6439,7 +6441,7 @@ end (** Committed context hashes / IDs. *) include S.HASH end -# 92 "v1.in.ml" +# 94 "v1.in.ml" module Pvss_secp256k1 : sig @@ -6473,7 +6475,7 @@ end include S.PVSS end -# 94 "v1.in.ml" +# 96 "v1.in.ml" module Sapling : sig @@ -6604,7 +6606,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 96 "v1.in.ml" +# 98 "v1.in.ml" module Micheline : sig @@ -6677,7 +6679,7 @@ val extract_locations : val inject_locations : (canonical_location -> 'l) -> 'p canonical -> ('l, 'p) node end -# 98 "v1.in.ml" +# 100 "v1.in.ml" module Block_header : sig @@ -6728,7 +6730,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 100 "v1.in.ml" +# 102 "v1.in.ml" module Fitness : sig @@ -6762,7 +6764,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 102 "v1.in.ml" +# 104 "v1.in.ml" module Operation : sig @@ -6806,7 +6808,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 104 "v1.in.ml" +# 106 "v1.in.ml" module Context : sig @@ -6873,7 +6875,7 @@ val register_resolver : val complete : t -> string -> string list Lwt.t end -# 106 "v1.in.ml" +# 108 "v1.in.ml" module Updater : sig @@ -7114,7 +7116,7 @@ val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t val fork_test_chain : Context.t -> protocol:Protocol_hash.t -> expiration:Time.t -> Context.t Lwt.t end -# 108 "v1.in.ml" +# 110 "v1.in.ml" module RPC_context : sig @@ -7269,6 +7271,6 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 110 "v1.in.ml" +# 112 "v1.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v2.in.ml b/src/lib_protocol_environment/sigs/v2.in.ml index fafe5618381e..9a87fbc2f4cc 100644 --- a/src/lib_protocol_environment/sigs/v2.in.ml +++ b/src/lib_protocol_environment/sigs/v2.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v2/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v2.ml b/src/lib_protocol_environment/sigs/v2.ml index 032c8534dee9..630c378cf88a 100644 --- a/src/lib_protocol_environment/sigs/v2.ml +++ b/src/lib_protocol_environment/sigs/v2.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v2.in.ml instead. *) # 1 "v2.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v2/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v2.in.ml" +# 6 "v2.in.ml" open Pervasives @@ -525,7 +527,7 @@ type 'a t = unit -> 'a node and +'a node = Nil | Cons of 'a * 'a t end -# 8 "v2.in.ml" +# 10 "v2.in.ml" module List : sig @@ -821,7 +823,7 @@ val merge : ('a -> 'a -> int) -> 'a list -> 'a list -> 'a list Not tail-recursive (sum of the lengths of the arguments). *) end -# 10 "v2.in.ml" +# 12 "v2.in.ml" module String : sig @@ -1069,7 +1071,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 12 "v2.in.ml" +# 14 "v2.in.ml" module Char : sig @@ -1129,7 +1131,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 14 "v2.in.ml" +# 16 "v2.in.ml" module Bytes : sig @@ -1395,7 +1397,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 *) end -# 16 "v2.in.ml" +# 18 "v2.in.ml" module Int32 : sig @@ -1545,7 +1547,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 18 "v2.in.ml" +# 20 "v2.in.ml" module Int64 : sig @@ -1703,7 +1705,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 20 "v2.in.ml" +# 22 "v2.in.ml" module Format : sig @@ -2456,7 +2458,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 22 "v2.in.ml" +# 24 "v2.in.ml" module Hex : sig @@ -2535,7 +2537,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 24 "v2.in.ml" +# 26 "v2.in.ml" module Z : sig @@ -3009,7 +3011,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 26 "v2.in.ml" +# 28 "v2.in.ml" module Lwt : sig @@ -3280,7 +3282,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 28 "v2.in.ml" +# 30 "v2.in.ml" module Lwt_list : sig @@ -3327,7 +3329,7 @@ val filter_map_s : ('a -> 'b option Lwt.t) -> 'a list -> 'b list Lwt.t val partition_s : ('a -> bool Lwt.t) -> 'a list -> ('a list * 'a list) Lwt.t end -# 30 "v2.in.ml" +# 32 "v2.in.ml" module Data_encoding : sig @@ -3756,7 +3758,7 @@ end the JSON encoding. *) val check_size : int -> 'a encoding -> 'a encoding end -# 32 "v2.in.ml" +# 34 "v2.in.ml" module Raw_hashes : sig @@ -3798,7 +3800,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 34 "v2.in.ml" +# 36 "v2.in.ml" module Compare : sig @@ -3884,7 +3886,7 @@ module List (P : COMPARABLE) : S with type t = P.t list module Option (P : COMPARABLE) : S with type t = P.t option end -# 36 "v2.in.ml" +# 38 "v2.in.ml" module Error_monad : sig @@ -4159,7 +4161,7 @@ type shell_tztrace type 'a shell_tzresult = ('a, shell_tztrace) result end -# 38 "v2.in.ml" +# 40 "v2.in.ml" open Error_monad @@ -4213,7 +4215,7 @@ val lwt_warn : ('a, Format.formatter, unit, unit Lwt.t) format4 -> 'a val lwt_log_error : ('a, Format.formatter, unit, unit Lwt.t) format4 -> 'a end -# 42 "v2.in.ml" +# 44 "v2.in.ml" module Time : sig @@ -4267,7 +4269,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 44 "v2.in.ml" +# 46 "v2.in.ml" module Option : sig @@ -4381,7 +4383,7 @@ val to_list : 'a option -> 'a list val to_seq : 'a option -> 'a Seq.t end -# 46 "v2.in.ml" +# 48 "v2.in.ml" module TzEndian : sig @@ -4431,7 +4433,7 @@ val get_uint8 : bytes -> int -> int val get_uint16 : bytes -> int -> int end -# 48 "v2.in.ml" +# 50 "v2.in.ml" module Bits : sig @@ -4466,7 +4468,7 @@ end <= x < 2^k] if [x > 0] and [0] otherwise. *) val numbits : int -> int end -# 50 "v2.in.ml" +# 52 "v2.in.ml" module RPC_arg : sig @@ -4528,7 +4530,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 52 "v2.in.ml" +# 54 "v2.in.ml" module RPC_path : sig @@ -4584,7 +4586,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 54 "v2.in.ml" +# 56 "v2.in.ml" module RPC_query : sig @@ -4656,7 +4658,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 56 "v2.in.ml" +# 58 "v2.in.ml" module RPC_service : sig @@ -4733,7 +4735,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 58 "v2.in.ml" +# 60 "v2.in.ml" module RPC_answer : sig @@ -4785,7 +4787,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 60 "v2.in.ml" +# 62 "v2.in.ml" module RPC_directory : sig @@ -5024,7 +5026,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 62 "v2.in.ml" +# 64 "v2.in.ml" module Base58 : sig @@ -5074,7 +5076,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit val decode : string -> data option end -# 64 "v2.in.ml" +# 66 "v2.in.ml" module S : sig @@ -5875,7 +5877,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 66 "v2.in.ml" +# 68 "v2.in.ml" module Set : sig @@ -5946,7 +5948,7 @@ module Make (Ord : OrderedType) : S.SET with type elt = Ord.t (** Functor building an implementation of the set structure given a totally ordered type. *) end -# 68 "v2.in.ml" +# 70 "v2.in.ml" module Map : sig @@ -6016,7 +6018,7 @@ module Make (Ord : OrderedType) : S.MAP with type key = Ord.t (** Functor building an implementation of the map structure given a totally ordered type. *) end -# 70 "v2.in.ml" +# 72 "v2.in.ml" module Blake2B : sig @@ -6080,7 +6082,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 72 "v2.in.ml" +# 74 "v2.in.ml" module Bls12_381 : sig @@ -6120,7 +6122,7 @@ include and type G1.Scalar.t = Fr.t and type G2.Scalar.t = Fr.t end -# 74 "v2.in.ml" +# 76 "v2.in.ml" module Ed25519 : sig @@ -6154,7 +6156,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 76 "v2.in.ml" +# 78 "v2.in.ml" module Secp256k1 : sig @@ -6188,7 +6190,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 78 "v2.in.ml" +# 80 "v2.in.ml" module P256 : sig @@ -6222,7 +6224,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 80 "v2.in.ml" +# 82 "v2.in.ml" module Chain_id : sig @@ -6254,7 +6256,7 @@ end include S.HASH end -# 82 "v2.in.ml" +# 84 "v2.in.ml" module Signature : sig @@ -6306,7 +6308,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 84 "v2.in.ml" +# 86 "v2.in.ml" module Block_hash : sig @@ -6339,7 +6341,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 86 "v2.in.ml" +# 88 "v2.in.ml" module Operation_hash : sig @@ -6372,7 +6374,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 88 "v2.in.ml" +# 90 "v2.in.ml" module Operation_list_hash : sig @@ -6405,7 +6407,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 90 "v2.in.ml" +# 92 "v2.in.ml" module Operation_list_list_hash : sig @@ -6438,7 +6440,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 92 "v2.in.ml" +# 94 "v2.in.ml" module Protocol_hash : sig @@ -6471,7 +6473,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 94 "v2.in.ml" +# 96 "v2.in.ml" module Context_hash : sig @@ -6504,7 +6506,7 @@ end (** Committed context hashes / IDs. *) include S.HASH end -# 96 "v2.in.ml" +# 98 "v2.in.ml" module Pvss_secp256k1 : sig @@ -6538,7 +6540,7 @@ end include S.PVSS end -# 98 "v2.in.ml" +# 100 "v2.in.ml" module Sapling : sig @@ -6669,7 +6671,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 100 "v2.in.ml" +# 102 "v2.in.ml" module Micheline : sig @@ -6742,7 +6744,7 @@ val extract_locations : val inject_locations : (canonical_location -> 'l) -> 'p canonical -> ('l, 'p) node end -# 102 "v2.in.ml" +# 104 "v2.in.ml" module Block_header : sig @@ -6793,7 +6795,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 104 "v2.in.ml" +# 106 "v2.in.ml" module Fitness : sig @@ -6827,7 +6829,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 106 "v2.in.ml" +# 108 "v2.in.ml" module Operation : sig @@ -6871,7 +6873,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 108 "v2.in.ml" +# 110 "v2.in.ml" module Context : sig @@ -7054,7 +7056,7 @@ val register_resolver : val complete : t -> string -> string list Lwt.t end -# 110 "v2.in.ml" +# 112 "v2.in.ml" module Updater : sig @@ -7295,7 +7297,7 @@ val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t val fork_test_chain : Context.t -> protocol:Protocol_hash.t -> expiration:Time.t -> Context.t Lwt.t end -# 112 "v2.in.ml" +# 114 "v2.in.ml" module RPC_context : sig @@ -7450,7 +7452,7 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 114 "v2.in.ml" +# 116 "v2.in.ml" module Equality_witness : sig @@ -7518,6 +7520,6 @@ val eq : 'a t -> 'b t -> ('a, 'b) eq option (** [hash id] returns a hash for [id]. *) val hash : 'a t -> int end -# 116 "v2.in.ml" +# 118 "v2.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v3.in.ml b/src/lib_protocol_environment/sigs/v3.in.ml index baaf52cd845f..7b03d9806127 100644 --- a/src/lib_protocol_environment/sigs/v3.in.ml +++ b/src/lib_protocol_environment/sigs/v3.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v3/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v3.ml b/src/lib_protocol_environment/sigs/v3.ml index 0591151e9bcd..c29ea5aeb23d 100644 --- a/src/lib_protocol_environment/sigs/v3.ml +++ b/src/lib_protocol_environment/sigs/v3.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v3.in.ml instead. *) # 1 "v3.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v3/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v3.in.ml" +# 6 "v3.in.ml" open Pervasives @@ -739,7 +741,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 8 "v3.in.ml" +# 10 "v3.in.ml" module Char : sig @@ -799,7 +801,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 10 "v3.in.ml" +# 12 "v3.in.ml" module Bytes : sig @@ -1065,7 +1067,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 *) end -# 12 "v3.in.ml" +# 14 "v3.in.ml" module Int32 : sig @@ -1215,7 +1217,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 14 "v3.in.ml" +# 16 "v3.in.ml" module Int64 : sig @@ -1373,7 +1375,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 16 "v3.in.ml" +# 18 "v3.in.ml" module Format : sig @@ -2126,7 +2128,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 18 "v3.in.ml" +# 20 "v3.in.ml" module Logging : sig @@ -2176,7 +2178,7 @@ val log : level -> ('a, Format.formatter, unit, unit) format4 -> 'a (** Same as [log] but more efficient with a simpler interface. *) val log_string : level -> string -> unit end -# 20 "v3.in.ml" +# 22 "v3.in.ml" module Hex : sig @@ -2255,7 +2257,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 22 "v3.in.ml" +# 24 "v3.in.ml" module Z : sig @@ -2729,7 +2731,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 24 "v3.in.ml" +# 26 "v3.in.ml" module Lwt : sig @@ -3000,7 +3002,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 26 "v3.in.ml" +# 28 "v3.in.ml" module Data_encoding : sig @@ -3451,7 +3453,7 @@ end the JSON encoding. *) val check_size : int -> 'a encoding -> 'a encoding end -# 28 "v3.in.ml" +# 30 "v3.in.ml" module Raw_hashes : sig @@ -3493,7 +3495,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 30 "v3.in.ml" +# 32 "v3.in.ml" module Compare : sig @@ -3579,7 +3581,7 @@ module List (P : COMPARABLE) : S with type t = P.t list module Option (P : COMPARABLE) : S with type t = P.t option end -# 32 "v3.in.ml" +# 34 "v3.in.ml" module Time : sig @@ -3633,7 +3635,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 34 "v3.in.ml" +# 36 "v3.in.ml" module TzEndian : sig @@ -3699,7 +3701,7 @@ val get_uint16_string : string -> int -> int val set_uint16 : bytes -> int -> int -> unit end -# 36 "v3.in.ml" +# 38 "v3.in.ml" module Bits : sig @@ -3734,7 +3736,7 @@ end <= x < 2^k] if [x > 0] and [0] otherwise. *) val numbits : int -> int end -# 38 "v3.in.ml" +# 40 "v3.in.ml" module Equality_witness : sig @@ -3802,7 +3804,7 @@ val eq : 'a t -> 'b t -> ('a, 'b) eq option (** [hash id] returns a hash for [id]. *) val hash : 'a t -> int end -# 40 "v3.in.ml" +# 42 "v3.in.ml" module FallbackArray : sig @@ -3878,7 +3880,7 @@ val map : ('a -> 'b) -> 'a t -> 'b t [init] on the first iteration. *) val fold : ('b -> 'a -> 'b) -> 'a t -> 'b -> 'b end -# 42 "v3.in.ml" +# 44 "v3.in.ml" module Error_monad : sig @@ -4124,7 +4126,7 @@ type shell_tztrace type 'a shell_tzresult = ('a, shell_tztrace) result end -# 44 "v3.in.ml" +# 46 "v3.in.ml" open Error_monad @@ -4251,7 +4253,7 @@ val iter_ep : them is. *) val iter_p : ('a -> unit Lwt.t) -> 'a t -> unit Lwt.t end -# 48 "v3.in.ml" +# 50 "v3.in.ml" module List : sig @@ -5129,7 +5131,7 @@ val exists_ep : 'a list -> (bool, 'error Error_monad.trace) result Lwt.t end -# 50 "v3.in.ml" +# 52 "v3.in.ml" module Set : sig @@ -5262,7 +5264,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type elt = Ord.t end -# 52 "v3.in.ml" +# 54 "v3.in.ml" module Map : sig @@ -5416,7 +5418,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type key = Ord.t end -# 54 "v3.in.ml" +# 56 "v3.in.ml" module Option : sig @@ -5564,7 +5566,7 @@ val catch : ?catch_only:(exn -> bool) -> (unit -> 'a) -> 'a option val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> 'a option Lwt.t end -# 56 "v3.in.ml" +# 58 "v3.in.ml" module Result : sig @@ -5716,7 +5718,7 @@ val catch_f : val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> ('a, exn) result Lwt.t end -# 58 "v3.in.ml" +# 60 "v3.in.ml" module RPC_arg : sig @@ -5778,7 +5780,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 60 "v3.in.ml" +# 62 "v3.in.ml" module RPC_path : sig @@ -5834,7 +5836,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 62 "v3.in.ml" +# 64 "v3.in.ml" module RPC_query : sig @@ -5906,7 +5908,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 64 "v3.in.ml" +# 66 "v3.in.ml" module RPC_service : sig @@ -5983,7 +5985,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 66 "v3.in.ml" +# 68 "v3.in.ml" module RPC_answer : sig @@ -6044,7 +6046,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 68 "v3.in.ml" +# 70 "v3.in.ml" module RPC_directory : sig @@ -6309,7 +6311,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 70 "v3.in.ml" +# 72 "v3.in.ml" module Base58 : sig @@ -6359,7 +6361,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit val decode : string -> data option end -# 72 "v3.in.ml" +# 74 "v3.in.ml" module S : sig @@ -6785,7 +6787,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 74 "v3.in.ml" +# 76 "v3.in.ml" module Blake2B : sig @@ -6849,7 +6851,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 76 "v3.in.ml" +# 78 "v3.in.ml" module Bls12_381 : sig @@ -6889,7 +6891,7 @@ include and type G1.Scalar.t = Fr.t and type G2.Scalar.t = Fr.t end -# 78 "v3.in.ml" +# 80 "v3.in.ml" module Ed25519 : sig @@ -6923,7 +6925,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 80 "v3.in.ml" +# 82 "v3.in.ml" module Secp256k1 : sig @@ -6957,7 +6959,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 82 "v3.in.ml" +# 84 "v3.in.ml" module P256 : sig @@ -6991,7 +6993,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 84 "v3.in.ml" +# 86 "v3.in.ml" module Chain_id : sig @@ -7023,7 +7025,7 @@ end include S.HASH end -# 86 "v3.in.ml" +# 88 "v3.in.ml" module Signature : sig @@ -7075,7 +7077,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 88 "v3.in.ml" +# 90 "v3.in.ml" module Block_hash : sig @@ -7108,7 +7110,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 90 "v3.in.ml" +# 92 "v3.in.ml" module Operation_hash : sig @@ -7141,7 +7143,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 92 "v3.in.ml" +# 94 "v3.in.ml" module Operation_list_hash : sig @@ -7174,7 +7176,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 94 "v3.in.ml" +# 96 "v3.in.ml" module Operation_list_list_hash : sig @@ -7207,7 +7209,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 96 "v3.in.ml" +# 98 "v3.in.ml" module Protocol_hash : sig @@ -7240,7 +7242,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 98 "v3.in.ml" +# 100 "v3.in.ml" module Context_hash : sig @@ -7293,7 +7295,7 @@ end type version = Version.t end -# 100 "v3.in.ml" +# 102 "v3.in.ml" module Pvss_secp256k1 : sig @@ -7327,7 +7329,7 @@ end include S.PVSS end -# 102 "v3.in.ml" +# 104 "v3.in.ml" module Sapling : sig @@ -7458,7 +7460,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 104 "v3.in.ml" +# 106 "v3.in.ml" module Timelock : sig @@ -7517,7 +7519,7 @@ val open_chest : chest -> chest_key -> time:int -> opening_result Used for gas accounting*) val get_plaintext_size : chest -> int end -# 106 "v3.in.ml" +# 108 "v3.in.ml" module Micheline : sig @@ -7590,7 +7592,7 @@ val extract_locations : val inject_locations : (canonical_location -> 'l) -> 'p canonical -> ('l, 'p) node end -# 108 "v3.in.ml" +# 110 "v3.in.ml" module Block_header : sig @@ -7641,7 +7643,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 110 "v3.in.ml" +# 112 "v3.in.ml" module Fitness : sig @@ -7675,7 +7677,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 112 "v3.in.ml" +# 114 "v3.in.ml" module Operation : sig @@ -7719,7 +7721,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 114 "v3.in.ml" +# 116 "v3.in.ml" module Context : sig @@ -8044,7 +8046,7 @@ module Cache : and type key = cache_key and type value = cache_value end -# 116 "v3.in.ml" +# 118 "v3.in.ml" module Updater : sig @@ -8343,7 +8345,7 @@ end not complete until [init] in invoked. *) val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t end -# 118 "v3.in.ml" +# 120 "v3.in.ml" module RPC_context : sig @@ -8498,6 +8500,6 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 120 "v3.in.ml" +# 122 "v3.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v4.in.ml b/src/lib_protocol_environment/sigs/v4.in.ml index 1c962ea55966..07afe4d2032d 100644 --- a/src/lib_protocol_environment/sigs/v4.in.ml +++ b/src/lib_protocol_environment/sigs/v4.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v4/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v4.ml b/src/lib_protocol_environment/sigs/v4.ml index 39addbd5935b..eb28f77518fa 100644 --- a/src/lib_protocol_environment/sigs/v4.ml +++ b/src/lib_protocol_environment/sigs/v4.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v4.in.ml instead. *) # 1 "v4.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v4/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v4.in.ml" +# 6 "v4.in.ml" open Pervasives @@ -739,7 +741,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 8 "v4.in.ml" +# 10 "v4.in.ml" module Char : sig @@ -799,7 +801,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 10 "v4.in.ml" +# 12 "v4.in.ml" module Bytes : sig @@ -1065,7 +1067,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 *) end -# 12 "v4.in.ml" +# 14 "v4.in.ml" module Int32 : sig @@ -1215,7 +1217,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 14 "v4.in.ml" +# 16 "v4.in.ml" module Int64 : sig @@ -1373,7 +1375,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 16 "v4.in.ml" +# 18 "v4.in.ml" module Format : sig @@ -2126,7 +2128,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 18 "v4.in.ml" +# 20 "v4.in.ml" module Logging : sig @@ -2176,7 +2178,7 @@ val log : level -> ('a, Format.formatter, unit, unit) format4 -> 'a (** Same as [log] but more efficient with a simpler interface. *) val log_string : level -> string -> unit end -# 20 "v4.in.ml" +# 22 "v4.in.ml" module Hex : sig @@ -2264,7 +2266,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 22 "v4.in.ml" +# 24 "v4.in.ml" module Z : sig @@ -2738,7 +2740,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 24 "v4.in.ml" +# 26 "v4.in.ml" module Lwt : sig @@ -3009,7 +3011,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 26 "v4.in.ml" +# 28 "v4.in.ml" module Data_encoding : sig @@ -3460,7 +3462,7 @@ end the JSON encoding. *) val check_size : int -> 'a encoding -> 'a encoding end -# 28 "v4.in.ml" +# 30 "v4.in.ml" module Raw_hashes : sig @@ -3502,7 +3504,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 30 "v4.in.ml" +# 32 "v4.in.ml" module Compare : sig @@ -3624,7 +3626,7 @@ module List_lengths : sig val equal : 'a list -> 'b list -> bool end end -# 32 "v4.in.ml" +# 34 "v4.in.ml" module Time : sig @@ -3678,7 +3680,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 34 "v4.in.ml" +# 36 "v4.in.ml" module TzEndian : sig @@ -3744,7 +3746,7 @@ val get_uint16_string : string -> int -> int val set_uint16 : bytes -> int -> int -> unit end -# 36 "v4.in.ml" +# 38 "v4.in.ml" module Bits : sig @@ -3779,7 +3781,7 @@ end <= x < 2^k] if [x > 0] and [0] otherwise. *) val numbits : int -> int end -# 38 "v4.in.ml" +# 40 "v4.in.ml" module Equality_witness : sig @@ -3847,7 +3849,7 @@ val eq : 'a t -> 'b t -> ('a, 'b) eq option (** [hash id] returns a hash for [id]. *) val hash : 'a t -> int end -# 40 "v4.in.ml" +# 42 "v4.in.ml" module FallbackArray : sig @@ -3923,7 +3925,7 @@ val map : ('a -> 'b) -> 'a t -> 'b t [init] on the first iteration. *) val fold : ('b -> 'a -> 'b) -> 'a t -> 'b -> 'b end -# 42 "v4.in.ml" +# 44 "v4.in.ml" module Error_monad : sig @@ -4153,7 +4155,7 @@ type shell_tztrace type 'a shell_tzresult = ('a, shell_tztrace) result end -# 44 "v4.in.ml" +# 46 "v4.in.ml" open Error_monad @@ -4280,7 +4282,7 @@ val iter_ep : them is. *) val iter_p : ('a -> unit Lwt.t) -> 'a t -> unit Lwt.t end -# 48 "v4.in.ml" +# 50 "v4.in.ml" module List : sig @@ -5224,7 +5226,7 @@ val exists_ep : 'a list -> (bool, 'error Error_monad.trace) result Lwt.t end -# 50 "v4.in.ml" +# 52 "v4.in.ml" module Set : sig @@ -5357,7 +5359,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type elt = Ord.t end -# 52 "v4.in.ml" +# 54 "v4.in.ml" module Map : sig @@ -5511,7 +5513,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type key = Ord.t end -# 54 "v4.in.ml" +# 56 "v4.in.ml" module Option : sig @@ -5659,7 +5661,7 @@ val catch : ?catch_only:(exn -> bool) -> (unit -> 'a) -> 'a option val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> 'a option Lwt.t end -# 56 "v4.in.ml" +# 58 "v4.in.ml" module Result : sig @@ -5825,7 +5827,7 @@ val catch_f : val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> ('a, exn) result Lwt.t end -# 58 "v4.in.ml" +# 60 "v4.in.ml" module RPC_arg : sig @@ -5895,7 +5897,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 60 "v4.in.ml" +# 62 "v4.in.ml" module RPC_path : sig @@ -5951,7 +5953,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 62 "v4.in.ml" +# 64 "v4.in.ml" module RPC_query : sig @@ -6023,7 +6025,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 64 "v4.in.ml" +# 66 "v4.in.ml" module RPC_service : sig @@ -6100,7 +6102,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 66 "v4.in.ml" +# 68 "v4.in.ml" module RPC_answer : sig @@ -6161,7 +6163,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 68 "v4.in.ml" +# 70 "v4.in.ml" module RPC_directory : sig @@ -6426,7 +6428,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 70 "v4.in.ml" +# 72 "v4.in.ml" module Base58 : sig @@ -6476,7 +6478,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit val decode : string -> data option end -# 72 "v4.in.ml" +# 74 "v4.in.ml" module S : sig @@ -6888,7 +6890,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 74 "v4.in.ml" +# 76 "v4.in.ml" module Blake2B : sig @@ -6952,7 +6954,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 76 "v4.in.ml" +# 78 "v4.in.ml" module Bls12_381 : sig @@ -6990,7 +6992,7 @@ module G2 : S.CURVE with type Scalar.t = Fr.t val pairing_check : (G1.t * G2.t) list -> bool end -# 78 "v4.in.ml" +# 80 "v4.in.ml" module Bls_signature : sig @@ -7058,7 +7060,7 @@ val verify : pk -> Bytes.t -> signature -> bool val aggregate_verify : (pk * Bytes.t) list -> signature -> bool end -# 80 "v4.in.ml" +# 82 "v4.in.ml" module Ed25519 : sig @@ -7092,7 +7094,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 82 "v4.in.ml" +# 84 "v4.in.ml" module Secp256k1 : sig @@ -7126,7 +7128,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 84 "v4.in.ml" +# 86 "v4.in.ml" module P256 : sig @@ -7160,7 +7162,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 86 "v4.in.ml" +# 88 "v4.in.ml" module Chain_id : sig @@ -7192,7 +7194,7 @@ end include S.HASH end -# 88 "v4.in.ml" +# 90 "v4.in.ml" module Signature : sig @@ -7244,7 +7246,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 90 "v4.in.ml" +# 92 "v4.in.ml" module Block_hash : sig @@ -7277,7 +7279,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 92 "v4.in.ml" +# 94 "v4.in.ml" module Operation_hash : sig @@ -7310,7 +7312,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 94 "v4.in.ml" +# 96 "v4.in.ml" module Operation_list_hash : sig @@ -7343,7 +7345,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 96 "v4.in.ml" +# 98 "v4.in.ml" module Operation_list_list_hash : sig @@ -7376,7 +7378,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 98 "v4.in.ml" +# 100 "v4.in.ml" module Protocol_hash : sig @@ -7409,7 +7411,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 100 "v4.in.ml" +# 102 "v4.in.ml" module Context_hash : sig @@ -7462,7 +7464,7 @@ end type version = Version.t end -# 102 "v4.in.ml" +# 104 "v4.in.ml" module Pvss_secp256k1 : sig @@ -7496,7 +7498,7 @@ end include S.PVSS end -# 104 "v4.in.ml" +# 106 "v4.in.ml" module Sapling : sig @@ -7627,7 +7629,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 106 "v4.in.ml" +# 108 "v4.in.ml" module Timelock : sig @@ -7686,7 +7688,7 @@ val open_chest : chest -> chest_key -> time:int -> opening_result Used for gas accounting*) val get_plaintext_size : chest -> int end -# 108 "v4.in.ml" +# 110 "v4.in.ml" module Micheline : sig @@ -7746,7 +7748,7 @@ val annotations : ('l, 'p) node -> string list val strip_locations : (_, 'p) node -> 'p canonical end -# 110 "v4.in.ml" +# 112 "v4.in.ml" module Block_header : sig @@ -7797,7 +7799,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 112 "v4.in.ml" +# 114 "v4.in.ml" module Fitness : sig @@ -7831,7 +7833,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 114 "v4.in.ml" +# 116 "v4.in.ml" module Operation : sig @@ -7875,7 +7877,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 116 "v4.in.ml" +# 118 "v4.in.ml" module Context : sig @@ -8205,7 +8207,7 @@ module Cache : and type key = cache_key and type value = cache_value end -# 118 "v4.in.ml" +# 120 "v4.in.ml" module Updater : sig @@ -8506,7 +8508,7 @@ end not complete until [init] in invoked. *) val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t end -# 120 "v4.in.ml" +# 122 "v4.in.ml" module RPC_context : sig @@ -8661,6 +8663,6 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 122 "v4.in.ml" +# 124 "v4.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v5.in.ml b/src/lib_protocol_environment/sigs/v5.in.ml index 7559b2af5030..26a308b3df45 100644 --- a/src/lib_protocol_environment/sigs/v5.in.ml +++ b/src/lib_protocol_environment/sigs/v5.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v5/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v5.ml b/src/lib_protocol_environment/sigs/v5.ml index 20ef03f70903..12ee6b4383ff 100644 --- a/src/lib_protocol_environment/sigs/v5.ml +++ b/src/lib_protocol_environment/sigs/v5.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v5.in.ml instead. *) # 1 "v5.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v5/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v5.in.ml" +# 6 "v5.in.ml" open Pervasives @@ -571,7 +573,7 @@ val compare : [right] to respectively compare values wrapped by [Left _ ] and [Right _]. [Left _] values are smaller than [Right _] values. *) end -# 8 "v5.in.ml" +# 10 "v5.in.ml" module String : sig @@ -819,7 +821,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 10 "v5.in.ml" +# 12 "v5.in.ml" module Char : sig @@ -879,7 +881,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 12 "v5.in.ml" +# 14 "v5.in.ml" module Bytes : sig @@ -1143,7 +1145,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 (4.05.0 in BytesLabels) *) end -# 14 "v5.in.ml" +# 16 "v5.in.ml" module Int32 : sig @@ -1294,7 +1296,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 16 "v5.in.ml" +# 18 "v5.in.ml" module Int64 : sig @@ -1453,7 +1455,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 18 "v5.in.ml" +# 20 "v5.in.ml" module Format : sig @@ -2217,7 +2219,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 20 "v5.in.ml" +# 22 "v5.in.ml" module Logging : sig @@ -2267,7 +2269,7 @@ val log : level -> ('a, Format.formatter, unit, unit) format4 -> 'a (** Same as [log] but more efficient with a simpler interface. *) val log_string : level -> string -> unit end -# 22 "v5.in.ml" +# 24 "v5.in.ml" module Hex : sig @@ -2355,7 +2357,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 24 "v5.in.ml" +# 26 "v5.in.ml" module Z : sig @@ -2829,7 +2831,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 26 "v5.in.ml" +# 28 "v5.in.ml" module Lwt : sig @@ -3100,7 +3102,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 28 "v5.in.ml" +# 30 "v5.in.ml" module Data_encoding : sig @@ -4589,7 +4591,7 @@ module Binary : sig val to_string_exn : ?buffer_size:int -> 'a encoding -> 'a -> string end end -# 30 "v5.in.ml" +# 32 "v5.in.ml" module Raw_hashes : sig @@ -4631,7 +4633,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 32 "v5.in.ml" +# 34 "v5.in.ml" module Compare : sig @@ -4909,7 +4911,7 @@ let compare (foo_a, bar_a) (foo_b, bar_b) = *) val or_else : int -> (unit -> int) -> int end -# 34 "v5.in.ml" +# 36 "v5.in.ml" module Time : sig @@ -4963,7 +4965,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 36 "v5.in.ml" +# 38 "v5.in.ml" module TzEndian : sig @@ -5029,7 +5031,7 @@ val get_uint16_string : string -> int -> int val set_uint16 : bytes -> int -> int -> unit end -# 38 "v5.in.ml" +# 40 "v5.in.ml" module Bits : sig @@ -5066,7 +5068,7 @@ end The behaviour is unspecified if [x < 0].*) val numbits : int -> int end -# 40 "v5.in.ml" +# 42 "v5.in.ml" module Equality_witness : sig @@ -5134,7 +5136,7 @@ val eq : 'a t -> 'b t -> ('a, 'b) eq option (** [hash id] returns a hash for [id]. *) val hash : 'a t -> int end -# 42 "v5.in.ml" +# 44 "v5.in.ml" module FallbackArray : sig @@ -5224,7 +5226,7 @@ val fold : ('b -> 'a -> 'b) -> 'a t -> 'b -> 'b filled. *) val fold_map : ('b -> 'a -> 'b * 'c) -> 'a t -> 'b -> 'c -> 'b * 'c t end -# 44 "v5.in.ml" +# 46 "v5.in.ml" module Error_monad : sig @@ -5654,7 +5656,7 @@ module Lwt_tzresult_syntax : sig ('a * 'b, 'error trace) result Lwt.t end end -# 46 "v5.in.ml" +# 48 "v5.in.ml" open Error_monad @@ -5781,7 +5783,7 @@ val iter_ep : them is. *) val iter_p : ('a -> unit Lwt.t) -> 'a t -> unit Lwt.t end -# 50 "v5.in.ml" +# 52 "v5.in.ml" module List : sig @@ -7113,7 +7115,7 @@ val exists_ep : 'a list -> (bool, 'error Error_monad.trace) result Lwt.t end -# 52 "v5.in.ml" +# 54 "v5.in.ml" module Set : sig @@ -7262,7 +7264,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type elt = Ord.t end -# 54 "v5.in.ml" +# 56 "v5.in.ml" module Map : sig @@ -7431,7 +7433,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type key = Ord.t end -# 56 "v5.in.ml" +# 58 "v5.in.ml" module Option : sig @@ -7579,7 +7581,7 @@ val catch : ?catch_only:(exn -> bool) -> (unit -> 'a) -> 'a option val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> 'a option Lwt.t end -# 58 "v5.in.ml" +# 60 "v5.in.ml" module Result : sig @@ -7745,7 +7747,7 @@ val catch_f : val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> ('a, exn) result Lwt.t end -# 60 "v5.in.ml" +# 62 "v5.in.ml" module RPC_arg : sig @@ -7815,7 +7817,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 62 "v5.in.ml" +# 64 "v5.in.ml" module RPC_path : sig @@ -7871,7 +7873,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 64 "v5.in.ml" +# 66 "v5.in.ml" module RPC_query : sig @@ -7943,7 +7945,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 66 "v5.in.ml" +# 68 "v5.in.ml" module RPC_service : sig @@ -8020,7 +8022,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 68 "v5.in.ml" +# 70 "v5.in.ml" module RPC_answer : sig @@ -8081,7 +8083,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 70 "v5.in.ml" +# 72 "v5.in.ml" module RPC_directory : sig @@ -8346,7 +8348,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 72 "v5.in.ml" +# 74 "v5.in.ml" module Base58 : sig @@ -8411,7 +8413,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit not start with a registered prefix. *) val decode : string -> data option end -# 74 "v5.in.ml" +# 76 "v5.in.ml" module S : sig @@ -8829,7 +8831,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 76 "v5.in.ml" +# 78 "v5.in.ml" module Blake2B : sig @@ -8894,7 +8896,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 78 "v5.in.ml" +# 80 "v5.in.ml" module Bls12_381 : sig @@ -8932,7 +8934,7 @@ module G2 : S.CURVE with type Scalar.t = Fr.t val pairing_check : (G1.t * G2.t) list -> bool end -# 80 "v5.in.ml" +# 82 "v5.in.ml" module Bls_signature : sig @@ -9028,7 +9030,7 @@ val verify : pk -> Bytes.t -> signature -> bool val aggregate_verify : (pk * Bytes.t) list -> signature -> bool end -# 82 "v5.in.ml" +# 84 "v5.in.ml" module Ed25519 : sig @@ -9062,7 +9064,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 84 "v5.in.ml" +# 86 "v5.in.ml" module Secp256k1 : sig @@ -9096,7 +9098,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 86 "v5.in.ml" +# 88 "v5.in.ml" module P256 : sig @@ -9130,7 +9132,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 88 "v5.in.ml" +# 90 "v5.in.ml" module Chain_id : sig @@ -9162,7 +9164,7 @@ end include S.HASH end -# 90 "v5.in.ml" +# 92 "v5.in.ml" module Signature : sig @@ -9214,7 +9216,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 92 "v5.in.ml" +# 94 "v5.in.ml" module Block_hash : sig @@ -9247,7 +9249,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 94 "v5.in.ml" +# 96 "v5.in.ml" module Operation_hash : sig @@ -9280,7 +9282,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 96 "v5.in.ml" +# 98 "v5.in.ml" module Operation_list_hash : sig @@ -9313,7 +9315,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 98 "v5.in.ml" +# 100 "v5.in.ml" module Operation_list_list_hash : sig @@ -9346,7 +9348,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 100 "v5.in.ml" +# 102 "v5.in.ml" module Protocol_hash : sig @@ -9379,7 +9381,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 102 "v5.in.ml" +# 104 "v5.in.ml" module Context_hash : sig @@ -9432,7 +9434,7 @@ end type version = Version.t end -# 104 "v5.in.ml" +# 106 "v5.in.ml" module Pvss_secp256k1 : sig @@ -9466,7 +9468,7 @@ end include S.PVSS end -# 106 "v5.in.ml" +# 108 "v5.in.ml" module Sapling : sig @@ -9614,7 +9616,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 108 "v5.in.ml" +# 110 "v5.in.ml" module Timelock : sig @@ -9673,7 +9675,7 @@ val open_chest : chest -> chest_key -> time:int -> opening_result Used for gas accounting*) val get_plaintext_size : chest -> int end -# 110 "v5.in.ml" +# 112 "v5.in.ml" module Micheline : sig @@ -9733,7 +9735,7 @@ val annotations : ('l, 'p) node -> string list val strip_locations : (_, 'p) node -> 'p canonical end -# 112 "v5.in.ml" +# 114 "v5.in.ml" module Block_header : sig @@ -9790,7 +9792,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 114 "v5.in.ml" +# 116 "v5.in.ml" module Bounded : sig @@ -9866,7 +9868,7 @@ module Int32 : sig module Make (_ : BOUNDS) : S end end -# 116 "v5.in.ml" +# 118 "v5.in.ml" module Fitness : sig @@ -9900,7 +9902,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 118 "v5.in.ml" +# 120 "v5.in.ml" module Operation : sig @@ -9944,7 +9946,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 120 "v5.in.ml" +# 122 "v5.in.ml" module Context : sig @@ -10581,7 +10583,7 @@ module Cache : and type key = cache_key and type value = cache_value end -# 122 "v5.in.ml" +# 124 "v5.in.ml" module Updater : sig @@ -10882,7 +10884,7 @@ end not complete until [init] in invoked. *) val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t end -# 124 "v5.in.ml" +# 126 "v5.in.ml" module RPC_context : sig @@ -11037,6 +11039,6 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 126 "v5.in.ml" +# 128 "v5.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v6.in.ml b/src/lib_protocol_environment/sigs/v6.in.ml index c798943c74fa..6941e8c0e192 100644 --- a/src/lib_protocol_environment/sigs/v6.in.ml +++ b/src/lib_protocol_environment/sigs/v6.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v6/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v6.ml b/src/lib_protocol_environment/sigs/v6.ml index e867da165143..894282b169e2 100644 --- a/src/lib_protocol_environment/sigs/v6.ml +++ b/src/lib_protocol_environment/sigs/v6.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v6.in.ml instead. *) # 1 "v6.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v6/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v6.in.ml" +# 6 "v6.in.ml" open Pervasives @@ -571,7 +573,7 @@ val compare : [right] to respectively compare values wrapped by [Left _ ] and [Right _]. [Left _] values are smaller than [Right _] values. *) end -# 8 "v6.in.ml" +# 10 "v6.in.ml" module String : sig @@ -819,7 +821,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 10 "v6.in.ml" +# 12 "v6.in.ml" module Char : sig @@ -879,7 +881,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 12 "v6.in.ml" +# 14 "v6.in.ml" module Bytes : sig @@ -1143,7 +1145,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 (4.05.0 in BytesLabels) *) end -# 14 "v6.in.ml" +# 16 "v6.in.ml" module Int32 : sig @@ -1294,7 +1296,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 16 "v6.in.ml" +# 18 "v6.in.ml" module Int64 : sig @@ -1453,7 +1455,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 18 "v6.in.ml" +# 20 "v6.in.ml" module Format : sig @@ -2217,7 +2219,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 20 "v6.in.ml" +# 22 "v6.in.ml" module Logging : sig @@ -2267,7 +2269,7 @@ val log : level -> ('a, Format.formatter, unit, unit) format4 -> 'a (** Same as [log] but more efficient with a simpler interface. *) val log_string : level -> string -> unit end -# 22 "v6.in.ml" +# 24 "v6.in.ml" module Hex : sig @@ -2355,7 +2357,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 24 "v6.in.ml" +# 26 "v6.in.ml" module Z : sig @@ -2829,7 +2831,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 26 "v6.in.ml" +# 28 "v6.in.ml" module Lwt : sig @@ -3100,7 +3102,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 28 "v6.in.ml" +# 30 "v6.in.ml" module Data_encoding : sig @@ -4589,7 +4591,7 @@ module Binary : sig val to_string_exn : ?buffer_size:int -> 'a encoding -> 'a -> string end end -# 30 "v6.in.ml" +# 32 "v6.in.ml" module Raw_hashes : sig @@ -4631,7 +4633,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 32 "v6.in.ml" +# 34 "v6.in.ml" module Compare : sig @@ -4909,7 +4911,7 @@ let compare (foo_a, bar_a) (foo_b, bar_b) = *) val or_else : int -> (unit -> int) -> int end -# 34 "v6.in.ml" +# 36 "v6.in.ml" module Time : sig @@ -4963,7 +4965,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 36 "v6.in.ml" +# 38 "v6.in.ml" module TzEndian : sig @@ -5029,7 +5031,7 @@ val get_uint16_string : string -> int -> int val set_uint16 : bytes -> int -> int -> unit end -# 38 "v6.in.ml" +# 40 "v6.in.ml" module Bits : sig @@ -5066,7 +5068,7 @@ end The behaviour is unspecified if [x < 0].*) val numbits : int -> int end -# 40 "v6.in.ml" +# 42 "v6.in.ml" module Equality_witness : sig @@ -5134,7 +5136,7 @@ val eq : 'a t -> 'b t -> ('a, 'b) eq option (** [hash id] returns a hash for [id]. *) val hash : 'a t -> int end -# 42 "v6.in.ml" +# 44 "v6.in.ml" module FallbackArray : sig @@ -5224,7 +5226,7 @@ val fold : ('b -> 'a -> 'b) -> 'a t -> 'b -> 'b filled. *) val fold_map : ('b -> 'a -> 'b * 'c) -> 'a t -> 'b -> 'c -> 'b * 'c t end -# 44 "v6.in.ml" +# 46 "v6.in.ml" module Error_monad : sig @@ -5654,7 +5656,7 @@ module Lwt_tzresult_syntax : sig ('a * 'b, 'error trace) result Lwt.t end end -# 46 "v6.in.ml" +# 48 "v6.in.ml" open Error_monad @@ -5781,7 +5783,7 @@ val iter_ep : them is. *) val iter_p : ('a -> unit Lwt.t) -> 'a t -> unit Lwt.t end -# 50 "v6.in.ml" +# 52 "v6.in.ml" module List : sig @@ -7113,7 +7115,7 @@ val exists_ep : 'a list -> (bool, 'error Error_monad.trace) result Lwt.t end -# 52 "v6.in.ml" +# 54 "v6.in.ml" module Set : sig @@ -7262,7 +7264,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type elt = Ord.t end -# 54 "v6.in.ml" +# 56 "v6.in.ml" module Map : sig @@ -7431,7 +7433,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type key = Ord.t end -# 56 "v6.in.ml" +# 58 "v6.in.ml" module Option : sig @@ -7579,7 +7581,7 @@ val catch : ?catch_only:(exn -> bool) -> (unit -> 'a) -> 'a option val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> 'a option Lwt.t end -# 58 "v6.in.ml" +# 60 "v6.in.ml" module Result : sig @@ -7745,7 +7747,7 @@ val catch_f : val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> ('a, exn) result Lwt.t end -# 60 "v6.in.ml" +# 62 "v6.in.ml" module RPC_arg : sig @@ -7815,7 +7817,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 62 "v6.in.ml" +# 64 "v6.in.ml" module RPC_path : sig @@ -7871,7 +7873,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 64 "v6.in.ml" +# 66 "v6.in.ml" module RPC_query : sig @@ -7943,7 +7945,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 66 "v6.in.ml" +# 68 "v6.in.ml" module RPC_service : sig @@ -8020,7 +8022,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 68 "v6.in.ml" +# 70 "v6.in.ml" module RPC_answer : sig @@ -8081,7 +8083,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 70 "v6.in.ml" +# 72 "v6.in.ml" module RPC_directory : sig @@ -8346,7 +8348,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 72 "v6.in.ml" +# 74 "v6.in.ml" module Base58 : sig @@ -8411,7 +8413,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit not start with a registered prefix. *) val decode : string -> data option end -# 74 "v6.in.ml" +# 76 "v6.in.ml" module S : sig @@ -8829,7 +8831,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 76 "v6.in.ml" +# 78 "v6.in.ml" module Blake2B : sig @@ -8894,7 +8896,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 78 "v6.in.ml" +# 80 "v6.in.ml" module Bls12_381 : sig @@ -8932,7 +8934,7 @@ module G2 : S.CURVE with type Scalar.t = Fr.t val pairing_check : (G1.t * G2.t) list -> bool end -# 80 "v6.in.ml" +# 82 "v6.in.ml" module Bls_signature : sig @@ -9028,7 +9030,7 @@ val verify : pk -> Bytes.t -> signature -> bool val aggregate_verify : (pk * Bytes.t) list -> signature -> bool end -# 82 "v6.in.ml" +# 84 "v6.in.ml" module Ed25519 : sig @@ -9062,7 +9064,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 84 "v6.in.ml" +# 86 "v6.in.ml" module Secp256k1 : sig @@ -9096,7 +9098,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 86 "v6.in.ml" +# 88 "v6.in.ml" module P256 : sig @@ -9130,7 +9132,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 88 "v6.in.ml" +# 90 "v6.in.ml" module Chain_id : sig @@ -9162,7 +9164,7 @@ end include S.HASH end -# 90 "v6.in.ml" +# 92 "v6.in.ml" module Signature : sig @@ -9214,7 +9216,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 92 "v6.in.ml" +# 94 "v6.in.ml" module Block_hash : sig @@ -9247,7 +9249,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 94 "v6.in.ml" +# 96 "v6.in.ml" module Operation_hash : sig @@ -9280,7 +9282,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 96 "v6.in.ml" +# 98 "v6.in.ml" module Operation_list_hash : sig @@ -9313,7 +9315,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 98 "v6.in.ml" +# 100 "v6.in.ml" module Operation_list_list_hash : sig @@ -9346,7 +9348,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 100 "v6.in.ml" +# 102 "v6.in.ml" module Protocol_hash : sig @@ -9379,7 +9381,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 102 "v6.in.ml" +# 104 "v6.in.ml" module Context_hash : sig @@ -9432,7 +9434,7 @@ end type version = Version.t end -# 104 "v6.in.ml" +# 106 "v6.in.ml" module Pvss_secp256k1 : sig @@ -9466,7 +9468,7 @@ end include S.PVSS end -# 106 "v6.in.ml" +# 108 "v6.in.ml" module Sapling : sig @@ -9614,7 +9616,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 108 "v6.in.ml" +# 110 "v6.in.ml" module Timelock : sig @@ -9673,7 +9675,7 @@ val open_chest : chest -> chest_key -> time:int -> opening_result Used for gas accounting*) val get_plaintext_size : chest -> int end -# 110 "v6.in.ml" +# 112 "v6.in.ml" module Vdf : sig @@ -9761,7 +9763,7 @@ val prove : discriminant -> challenge -> difficulty -> result * proof @raise Invalid_argument when inputs are invalid *) val verify : discriminant -> challenge -> difficulty -> result -> proof -> bool end -# 112 "v6.in.ml" +# 114 "v6.in.ml" module Micheline : sig @@ -9821,7 +9823,7 @@ val annotations : ('l, 'p) node -> string list val strip_locations : (_, 'p) node -> 'p canonical end -# 114 "v6.in.ml" +# 116 "v6.in.ml" module Block_header : sig @@ -9878,7 +9880,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 116 "v6.in.ml" +# 118 "v6.in.ml" module Bounded : sig @@ -9956,7 +9958,7 @@ module Int32 : sig module NonNegative : S end end -# 118 "v6.in.ml" +# 120 "v6.in.ml" module Fitness : sig @@ -9990,7 +9992,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 120 "v6.in.ml" +# 122 "v6.in.ml" module Operation : sig @@ -10034,7 +10036,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 122 "v6.in.ml" +# 124 "v6.in.ml" module Context : sig @@ -10671,7 +10673,7 @@ module Cache : and type key = cache_key and type value = cache_value end -# 124 "v6.in.ml" +# 126 "v6.in.ml" module Updater : sig @@ -10976,7 +10978,7 @@ end not complete until [init] in invoked. *) val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t end -# 126 "v6.in.ml" +# 128 "v6.in.ml" module RPC_context : sig @@ -11131,7 +11133,7 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 128 "v6.in.ml" +# 130 "v6.in.ml" module Wasm_2_0_0 : sig @@ -11184,7 +11186,7 @@ module Make val get_info : Tree.tree -> info Lwt.t end end -# 130 "v6.in.ml" +# 132 "v6.in.ml" module Plonk : sig @@ -11269,6 +11271,6 @@ val verify_multi_circuits : proof -> bool end -# 132 "v6.in.ml" +# 134 "v6.in.ml" end diff --git a/src/lib_protocol_environment/sigs/v7.in.ml b/src/lib_protocol_environment/sigs/v7.in.ml index fcee2305aaa5..ba5389ca2ddc 100644 --- a/src/lib_protocol_environment/sigs/v7.in.ml +++ b/src/lib_protocol_environment/sigs/v7.in.ml @@ -1,6 +1,8 @@ -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : [%sig "v7/pervasives.mli"] open Pervasives diff --git a/src/lib_protocol_environment/sigs/v7.ml b/src/lib_protocol_environment/sigs/v7.ml index a0b6774e300e..bb9f3e77f19f 100644 --- a/src/lib_protocol_environment/sigs/v7.ml +++ b/src/lib_protocol_environment/sigs/v7.ml @@ -1,9 +1,11 @@ (* This file was automatically generated, do not edit.*) (* Edit file v7.in.ml instead. *) # 1 "v7.in.ml" -open Tezos_protocol_environment_sigs_internals - module type T = sig + module CamlinternalFormatBasics : module type of struct + include Tezos_protocol_environment_sigs_internals.CamlinternalFormatBasics + end + module Pervasives : sig # 1 "v7/pervasives.mli" (**************************************************************************) @@ -489,7 +491,7 @@ val ( ^^ ) : Right-associative operator, see {!Ocaml_operators} for more information. *) end -# 4 "v7.in.ml" +# 6 "v7.in.ml" open Pervasives @@ -571,7 +573,7 @@ val compare : [right] to respectively compare values wrapped by [Left _ ] and [Right _]. [Left _] values are smaller than [Right _] values. *) end -# 8 "v7.in.ml" +# 10 "v7.in.ml" module String : sig @@ -819,7 +821,7 @@ val split_on_char: char -> string -> string list @since 4.04.0 *) end -# 10 "v7.in.ml" +# 12 "v7.in.ml" module Char : sig @@ -879,7 +881,7 @@ val equal: t -> t -> bool (** The equal function for chars. @since 4.03.0 *) end -# 12 "v7.in.ml" +# 14 "v7.in.ml" module Bytes : sig @@ -1143,7 +1145,7 @@ val equal: t -> t -> bool (** The equality function for byte sequences. @since 4.03.0 (4.05.0 in BytesLabels) *) end -# 14 "v7.in.ml" +# 16 "v7.in.ml" module Int32 : sig @@ -1294,7 +1296,7 @@ val equal: t -> t -> bool (** The equal function for int32s. @since 4.03.0 *) end -# 16 "v7.in.ml" +# 18 "v7.in.ml" module Int64 : sig @@ -1453,7 +1455,7 @@ val equal: t -> t -> bool (** The equal function for int64s. @since 4.03.0 *) end -# 18 "v7.in.ml" +# 20 "v7.in.ml" module Format : sig @@ -2217,7 +2219,7 @@ val kasprintf : (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b @since 4.03 *) end -# 20 "v7.in.ml" +# 22 "v7.in.ml" module Logging : sig @@ -2267,7 +2269,7 @@ val log : level -> ('a, Format.formatter, unit, unit) format4 -> 'a (** Same as [log] but more efficient with a simpler interface. *) val log_string : level -> string -> unit end -# 22 "v7.in.ml" +# 24 "v7.in.ml" module Hex : sig @@ -2355,7 +2357,7 @@ val show : t -> string (** [show t] will return a human-readable hex representation of [t] as a string. *) end -# 24 "v7.in.ml" +# 26 "v7.in.ml" module Z : sig @@ -2829,7 +2831,7 @@ external of_bits: string -> t = "ml_z_of_bits" trailing zeros in s. *) end -# 26 "v7.in.ml" +# 28 "v7.in.ml" module Lwt : sig @@ -3100,7 +3102,7 @@ val return_false : bool t (** [Lwt.return_false] is like {!Lwt.return_unit}, but for {!Lwt.return}[ false]. *) end -# 28 "v7.in.ml" +# 30 "v7.in.ml" module Data_encoding : sig @@ -4589,7 +4591,7 @@ module Binary : sig val to_string_exn : ?buffer_size:int -> 'a encoding -> 'a -> string end end -# 30 "v7.in.ml" +# 32 "v7.in.ml" module Raw_hashes : sig @@ -4631,7 +4633,7 @@ val sha3_256 : bytes -> bytes val sha3_512 : bytes -> bytes end -# 32 "v7.in.ml" +# 34 "v7.in.ml" module Compare : sig @@ -4909,7 +4911,7 @@ let compare (foo_a, bar_a) (foo_b, bar_b) = *) val or_else : int -> (unit -> int) -> int end -# 34 "v7.in.ml" +# 36 "v7.in.ml" module Time : sig @@ -4963,7 +4965,7 @@ val rfc_encoding : t Data_encoding.t val pp_hum : Format.formatter -> t -> unit end -# 36 "v7.in.ml" +# 38 "v7.in.ml" module TzEndian : sig @@ -5029,7 +5031,7 @@ val get_uint16_string : string -> int -> int val set_uint16 : bytes -> int -> int -> unit end -# 38 "v7.in.ml" +# 40 "v7.in.ml" module Bits : sig @@ -5066,7 +5068,7 @@ end The behaviour is unspecified if [x < 0].*) val numbits : int -> int end -# 40 "v7.in.ml" +# 42 "v7.in.ml" module Equality_witness : sig @@ -5134,7 +5136,7 @@ val eq : 'a t -> 'b t -> ('a, 'b) eq option (** [hash id] returns a hash for [id]. *) val hash : 'a t -> int end -# 42 "v7.in.ml" +# 44 "v7.in.ml" module FallbackArray : sig @@ -5224,7 +5226,7 @@ val fold : ('b -> 'a -> 'b) -> 'a t -> 'b -> 'b filled. *) val fold_map : ('b -> 'a -> 'b * 'c) -> 'a t -> 'b -> 'c -> 'b * 'c t end -# 44 "v7.in.ml" +# 46 "v7.in.ml" module Error_monad : sig @@ -5654,7 +5656,7 @@ module Lwt_tzresult_syntax : sig ('a * 'b, 'error trace) result Lwt.t end end -# 46 "v7.in.ml" +# 48 "v7.in.ml" open Error_monad @@ -5781,7 +5783,7 @@ val iter_ep : them is. *) val iter_p : ('a -> unit Lwt.t) -> 'a t -> unit Lwt.t end -# 50 "v7.in.ml" +# 52 "v7.in.ml" module List : sig @@ -7113,7 +7115,7 @@ val exists_ep : 'a list -> (bool, 'error Error_monad.trace) result Lwt.t end -# 52 "v7.in.ml" +# 54 "v7.in.ml" module Set : sig @@ -7262,7 +7264,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type elt = Ord.t end -# 54 "v7.in.ml" +# 56 "v7.in.ml" module Map : sig @@ -7431,7 +7433,7 @@ end module Make (Ord : Compare.COMPARABLE) : S with type key = Ord.t end -# 56 "v7.in.ml" +# 58 "v7.in.ml" module Option : sig @@ -7579,7 +7581,7 @@ val catch : ?catch_only:(exn -> bool) -> (unit -> 'a) -> 'a option val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> 'a option Lwt.t end -# 58 "v7.in.ml" +# 60 "v7.in.ml" module Result : sig @@ -7745,7 +7747,7 @@ val catch_f : val catch_s : ?catch_only:(exn -> bool) -> (unit -> 'a Lwt.t) -> ('a, exn) result Lwt.t end -# 60 "v7.in.ml" +# 62 "v7.in.ml" module RPC_arg : sig @@ -7815,7 +7817,7 @@ type ('a, 'b) eq = Eq : ('a, 'a) eq val eq : 'a arg -> 'b arg -> ('a, 'b) eq option end -# 62 "v7.in.ml" +# 64 "v7.in.ml" module RPC_path : sig @@ -7871,7 +7873,7 @@ val add_final_args : val ( /:* ) : ('prefix, 'params) path -> 'a RPC_arg.t -> ('prefix, 'params * 'a list) path end -# 64 "v7.in.ml" +# 66 "v7.in.ml" module RPC_query : sig @@ -7943,7 +7945,7 @@ exception Invalid of string val parse : 'a query -> untyped -> 'a end -# 66 "v7.in.ml" +# 68 "v7.in.ml" module RPC_service : sig @@ -8020,7 +8022,7 @@ val put_service : ('prefix, 'params) RPC_path.t -> ([`PUT], 'prefix, 'params, 'query, 'input, 'output) service end -# 68 "v7.in.ml" +# 70 "v7.in.ml" module RPC_answer : sig @@ -8081,7 +8083,7 @@ val not_found : 'o t Lwt.t val fail : error list -> 'a t Lwt.t end -# 70 "v7.in.ml" +# 72 "v7.in.ml" module RPC_directory : sig @@ -8346,7 +8348,7 @@ val register_dynamic_directory : ('a -> 'a directory Lwt.t) -> 'prefix directory end -# 72 "v7.in.ml" +# 74 "v7.in.ml" module Base58 : sig @@ -8411,7 +8413,7 @@ val check_encoded_prefix : 'a encoding -> string -> int -> unit not start with a registered prefix. *) val decode : string -> data option end -# 74 "v7.in.ml" +# 76 "v7.in.ml" module S : sig @@ -8829,7 +8831,7 @@ module type PVSS = sig val reconstruct : Clear_share.t list -> int list -> Public_key.t end end -# 76 "v7.in.ml" +# 78 "v7.in.ml" module Blake2B : sig @@ -8894,7 +8896,7 @@ end module Make (Register : Register) (Name : PrefixedName) : S.HASH end -# 78 "v7.in.ml" +# 80 "v7.in.ml" module Bls12_381 : sig @@ -8932,7 +8934,7 @@ module G2 : S.CURVE with type Scalar.t = Fr.t val pairing_check : (G1.t * G2.t) list -> bool end -# 80 "v7.in.ml" +# 82 "v7.in.ml" module Bls_signature : sig @@ -9028,7 +9030,7 @@ val verify : pk -> Bytes.t -> signature -> bool val aggregate_verify : (pk * Bytes.t) list -> signature -> bool end -# 82 "v7.in.ml" +# 84 "v7.in.ml" module Ed25519 : sig @@ -9062,7 +9064,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 84 "v7.in.ml" +# 86 "v7.in.ml" module Secp256k1 : sig @@ -9096,7 +9098,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 86 "v7.in.ml" +# 88 "v7.in.ml" module P256 : sig @@ -9130,7 +9132,7 @@ end include S.SIGNATURE with type watermark := bytes end -# 88 "v7.in.ml" +# 90 "v7.in.ml" module Chain_id : sig @@ -9162,7 +9164,7 @@ end include S.HASH end -# 90 "v7.in.ml" +# 92 "v7.in.ml" module Signature : sig @@ -9214,7 +9216,7 @@ include and type Public_key.t = public_key and type watermark := watermark end -# 92 "v7.in.ml" +# 94 "v7.in.ml" module Block_hash : sig @@ -9247,7 +9249,7 @@ end (** Blocks hashes / IDs. *) include S.HASH end -# 94 "v7.in.ml" +# 96 "v7.in.ml" module Operation_hash : sig @@ -9280,7 +9282,7 @@ end (** Operations hashes / IDs. *) include S.HASH end -# 96 "v7.in.ml" +# 98 "v7.in.ml" module Operation_list_hash : sig @@ -9313,7 +9315,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_hash.t end -# 98 "v7.in.ml" +# 100 "v7.in.ml" module Operation_list_list_hash : sig @@ -9346,7 +9348,7 @@ end (** Blocks hashes / IDs. *) include S.MERKLE_TREE with type elt = Operation_list_hash.t end -# 100 "v7.in.ml" +# 102 "v7.in.ml" module Protocol_hash : sig @@ -9379,7 +9381,7 @@ end (** Protocol hashes / IDs. *) include S.HASH end -# 102 "v7.in.ml" +# 104 "v7.in.ml" module Context_hash : sig @@ -9432,7 +9434,7 @@ end type version = Version.t end -# 104 "v7.in.ml" +# 106 "v7.in.ml" module Pvss_secp256k1 : sig @@ -9466,7 +9468,7 @@ end include S.PVSS end -# 106 "v7.in.ml" +# 108 "v7.in.ml" module Sapling : sig @@ -9614,7 +9616,7 @@ module Verification : sig val final_check : t -> UTXO.transaction -> string -> bool end end -# 108 "v7.in.ml" +# 110 "v7.in.ml" module Timelock : sig @@ -9673,7 +9675,7 @@ val open_chest : chest -> chest_key -> time:int -> opening_result Used for gas accounting*) val get_plaintext_size : chest -> int end -# 110 "v7.in.ml" +# 112 "v7.in.ml" module Vdf : sig @@ -9761,7 +9763,7 @@ val prove : discriminant -> challenge -> difficulty -> result * proof @raise Invalid_argument when inputs are invalid *) val verify : discriminant -> challenge -> difficulty -> result -> proof -> bool end -# 112 "v7.in.ml" +# 114 "v7.in.ml" module Micheline : sig @@ -9821,7 +9823,7 @@ val annotations : ('l, 'p) node -> string list val strip_locations : (_, 'p) node -> 'p canonical end -# 114 "v7.in.ml" +# 116 "v7.in.ml" module Block_header : sig @@ -9878,7 +9880,7 @@ type t = {shell : shell_header; protocol_data : bytes} include S.HASHABLE with type t := t and type hash := Block_hash.t end -# 116 "v7.in.ml" +# 118 "v7.in.ml" module Bounded : sig @@ -9956,7 +9958,7 @@ module Int32 : sig module NonNegative : S end end -# 118 "v7.in.ml" +# 120 "v7.in.ml" module Fitness : sig @@ -9990,7 +9992,7 @@ end compared in a lexicographical order (longer list are greater). *) include S.T with type t = bytes list end -# 120 "v7.in.ml" +# 122 "v7.in.ml" module Operation : sig @@ -10034,7 +10036,7 @@ type t = {shell : shell_header; proto : bytes} include S.HASHABLE with type t := t and type hash := Operation_hash.t end -# 122 "v7.in.ml" +# 124 "v7.in.ml" module Context : sig @@ -10671,7 +10673,7 @@ module Cache : and type key = cache_key and type value = cache_value end -# 124 "v7.in.ml" +# 126 "v7.in.ml" module Updater : sig @@ -10976,7 +10978,7 @@ end not complete until [init] in invoked. *) val activate : Context.t -> Protocol_hash.t -> Context.t Lwt.t end -# 126 "v7.in.ml" +# 128 "v7.in.ml" module RPC_context : sig @@ -11131,7 +11133,7 @@ val make_opt_call3 : 'i -> 'o option shell_tzresult Lwt.t end -# 128 "v7.in.ml" +# 130 "v7.in.ml" module Wasm_2_0_0 : sig @@ -11184,7 +11186,7 @@ module Make val get_info : Tree.tree -> info Lwt.t end end -# 130 "v7.in.ml" +# 132 "v7.in.ml" module Plonk : sig @@ -11269,7 +11271,7 @@ val verify_multi_circuits : proof -> bool end -# 132 "v7.in.ml" +# 134 "v7.in.ml" module Dal : sig @@ -11372,6 +11374,6 @@ val verify_segment : [> `Degree_exceeds_srs_length of string | `Segment_index_out_of_range] ) Result.t end -# 134 "v7.in.ml" +# 136 "v7.in.ml" end diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index 9f5d4b77a2ba..0881b15281d1 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"000-Ps9mPmXa\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"000-Ps9mPmXa\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_000_Ps9mPmXa) diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index 72a091e73309..2d96b255b06d 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"001-PtCJ7pwo\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"001-PtCJ7pwo\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_001_PtCJ7pwo) diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 151a758e3d8b..d85c31e4f270 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"002-PsYLVpVv\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"002-PsYLVpVv\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_002_PsYLVpVv) diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index c830a6fd7394..17e38adb0078 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"003-PsddFKi3\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"003-PsddFKi3\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_003_PsddFKi3) diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 2dc6fe74f14b..3bbb0d30d18c 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"004-Pt24m4xi\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"004-Pt24m4xi\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_004_Pt24m4xi) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index 0486a4595623..c046e241de52 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"005-PsBABY5H\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"005-PsBABY5H\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_005_PsBABY5H) diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 26703f1ad47d..b10cd9f4381e 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"005-PsBabyM1\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"005-PsBabyM1\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_005_PsBabyM1) diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index 2380a2a8f14c..9e13a0a9effd 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"006-PsCARTHA\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"006-PsCARTHA\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_006_PsCARTHA) diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index 953b85877f21..1dd0b2058dcd 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"007-PsDELPH1\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"007-PsDELPH1\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_007_PsDELPH1) diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 59e97a4bec2a..b26fcd97dd77 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"008-PtEdo2Zk\" end\ninclude Tezos_protocol_environment.V1.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"008-PtEdo2Zk\" end\ninclude Tezos_protocol_environment.V1.Make(Name)()\n"))) (library (name tezos_raw_protocol_008_PtEdo2Zk) diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 74861bf0201a..3cdb3f19ec4f 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"008-PtEdoTez\" end\ninclude Tezos_protocol_environment.V1.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"008-PtEdoTez\" end\ninclude Tezos_protocol_environment.V1.Make(Name)()\n"))) (library (name tezos_raw_protocol_008_PtEdoTez) diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index 58f91b9a5cbe..c7ed4ffdfa5e 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"009-PsFLoren\" end\ninclude Tezos_protocol_environment.V2.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"009-PsFLoren\" end\ninclude Tezos_protocol_environment.V2.Make(Name)()\n"))) (library (name tezos_raw_protocol_009_PsFLoren) diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index f3f1b4278d01..d36173b62d91 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"010-PtGRANAD\" end\ninclude Tezos_protocol_environment.V2.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"010-PtGRANAD\" end\ninclude Tezos_protocol_environment.V2.Make(Name)()\n"))) (library (name tezos_raw_protocol_010_PtGRANAD) diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index ec0bdd2f15f8..4356adc6e384 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"011-PtHangz2\" end\ninclude Tezos_protocol_environment.V3.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"011-PtHangz2\" end\ninclude Tezos_protocol_environment.V3.Make(Name)()\n"))) (library (name tezos_raw_protocol_011_PtHangz2) diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 165dea554aa1..b4a33cba9b7d 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"012-Psithaca\" end\ninclude Tezos_protocol_environment.V4.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"012-Psithaca\" end\ninclude Tezos_protocol_environment.V4.Make(Name)()\n"))) (library (name tezos_raw_protocol_012_Psithaca) diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index fac88f2f7167..374e3a732871 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"013-PtJakart\" end\ninclude Tezos_protocol_environment.V5.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"013-PtJakart\" end\ninclude Tezos_protocol_environment.V5.Make(Name)()\n"))) (library (name tezos_raw_protocol_013_PtJakart) diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune index 09673d17487d..edceedba5b34 100644 --- a/src/proto_014_PtKathma/lib_protocol/dune +++ b/src/proto_014_PtKathma/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"014-PtKathma\" end\ninclude Tezos_protocol_environment.V6.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"014-PtKathma\" end\ninclude Tezos_protocol_environment.V6.Make(Name)()\n"))) (library (name tezos_raw_protocol_014_PtKathma) diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index 23c5ed1a208d..d158d872b96b 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.V7.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.V7.Make(Name)()\n"))) (library (name tezos_raw_protocol_alpha) diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index 04dd4854b92e..4bf6b499329c 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"demo-counter\" end\ninclude Tezos_protocol_environment.V7.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"demo-counter\" end\ninclude Tezos_protocol_environment.V7.Make(Name)()\n"))) (library (name tezos_raw_protocol_demo_counter) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index de2e36383b1e..418dfe54d954 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"demo-noops\" end\ninclude Tezos_protocol_environment.V7.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"demo-noops\" end\ninclude Tezos_protocol_environment.V7.Make(Name)()\n"))) (library (name tezos_raw_protocol_demo_noops) diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 6aca3d03a956..c3fa4fea8119 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"genesis\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"genesis\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\n"))) (library (name tezos_raw_protocol_genesis) -- GitLab From ec34d171ff77f2d3c58cb151577c859ce753c11e Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Mon, 1 Aug 2022 11:03:03 +0200 Subject: [PATCH 2/2] Proto-compiler: sigs_internals is not longer needed to compile protos --- manifest/main.ml | 2 -- src/lib_protocol_compiler/dune | 1 - 2 files changed, 3 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 2192e6bb8203..af8dbafc6014 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2000,8 +2000,6 @@ let octez_protocol_compiler_lib = S "-o"; S "%{targets}"; ]; - S - "%{lib:tezos-protocol-environment.sigs-internals:tezos_protocol_environment_sigs_internals.cmi}"; S "%{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmi}"; S diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index d5a21cb7145f..5588e4f58c20 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -27,7 +27,6 @@ (action (run %{bin:ocp-ocamlres} -format variants -o %{targets} - %{lib:tezos-protocol-environment.sigs-internals:tezos_protocol_environment_sigs_internals.cmi} %{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmi} %{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs__V0.cmi} %{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs__V1.cmi} -- GitLab