From 196c10d96ad034f283be5f970feb28f9ca34201b Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Fri, 7 Jul 2023 15:50:14 +0200 Subject: [PATCH 01/13] Manifest: Introduce sub_lib function --- manifest/main.ml | 166 +++++----------------------------- manifest/manifest.ml | 201 ++++++++++++++++++++++++++++++++++++++++++ manifest/manifest.mli | 38 ++++++++ 3 files changed, 263 insertions(+), 142 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 20c1d401cf5d..38fc89b3d899 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -453,147 +453,17 @@ let alcotezt = ~deps:[tezt_core_lib] |> open_ -type sub_lib_documentation_entrypoint = Module | Page | Sub_lib - -type sub_lib = { - name : string; - synopsis : string option; - documentation_type : sub_lib_documentation_entrypoint; -} - -(* List of the registered sublibraries of octez-libs *) -let registered_octez_libs : sub_lib list ref = ref [] - -(* Registers [public_name] as a sublibrary of the [octez-libs] package. - - If [documentation] is [None] or only contains a package stanza, then the - documentation page of [octez-libs] will point to the module API of the public library. - Otherwise, it will assume that the package contains a [package_name.mld] file - and it will link to that. *) -let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs - ?documentation ?conflicts ?flags ?time_measurement_ppx ?deps ?dune ?modules - ?linkall ?js_compatible ?bisect_ppx ?preprocess ?opam_only_deps ?cram - ?release_status ?ctypes ?c_library_flags ?opam_with_test ?synopsis ~path - public_name = - let name = - let s = Option.value ~default:public_name internal_name in - String.map - (function - | '-' | '.' -> '_' - | '/' -> - invalid_arg ("octez library " ^ s ^ " name cannot contain \"/\"") - | c -> c) - s - in - let registered = - match documentation with - | None | Some Dune.[[S "package"; S "octez-libs"]] -> - (* In the case that the documentation stanza is only a package declaration, - we don't want the page to be used *) - if String.contains (Option.value ~default:public_name internal_name) '.' - then - { - name = String.capitalize_ascii name; - synopsis; - documentation_type = Sub_lib; - } - else - { - name = String.capitalize_ascii name; - synopsis; - documentation_type = Module; - } - | Some _docs -> {name; synopsis; documentation_type = Page} - in - - if - List.exists - (fun registered -> String.equal registered.name name) - !registered_octez_libs - then - invalid_arg - (Format.sprintf - "octez-libs already contains a library that would have the same \ - internal name, %s, as %s" - (Option.value ~default:public_name internal_name) - name) - else registered_octez_libs := registered :: !registered_octez_libs ; - public_lib - ("octez-libs." ^ public_name) - ~internal_name:name - ~opam:"octez-libs" - ~synopsis: +(* Container of the registered sublibraries of [octez-libs] *) +let registered_octez_libs : Sub_lib.container = Sub_lib.make_container () + +(* Registers a sub-library in [octez-libs] packages. + This package should contain all Octez basic libraries. *) +let octez_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis: "A package that contains multiple base libraries used by the Octez suite" - ?opam_with_test - ?linkall - ?js_compatible - ?bisect_ppx - ?js_of_ocaml - ?inline_tests - ?foreign_stubs - ?documentation - ?conflicts - ?flags - ?time_measurement_ppx - ?deps - ?modules - ?dune - ?preprocess - ?opam_only_deps - ?cram - ?release_status - ?ctypes - ?c_library_flags - ~path - ~ocaml: - V.( - (* TODO: https://gitlab.com/tezos/tezos/-/issues/6112 - Should be in sync with scripts/version.sh *) - at_least "4.14.1" && less_than "4.15") - ~license:"Apache-2.0" - ~extra_authors:["WebAssembly Authors"] - -(* Prints all the registered octez libraries as a documentation index *) -let pp_octez_libs_index fmt registered_octez_libs = - let header = - "{0 Octez-libs: Octez libraries}\n\n\ - This is a package containing some libraries used by the Octez project.\n\n\ - It contains the following libraries:\n\n" - in - let pp_registered pp = function - | {name; synopsis = None; documentation_type = Module} -> - Format.fprintf pp "- {{!module-%s}%s}@." name name - | {name; synopsis = Some synopsis; documentation_type = Module} -> - Format.fprintf pp "- {{!module-%s}%s}: %s@." name name synopsis - | {name; synopsis = None; documentation_type = Page} -> - Format.fprintf - pp - "- {{!page-%s}%s}@." - name - (String.capitalize_ascii name) - | {name; synopsis = Some synopsis; documentation_type = Page} -> - Format.fprintf - pp - "- {{!page-%s}%s}: %s@." - name - (String.capitalize_ascii name) - synopsis - | {documentation_type = Sub_lib; _} -> - (* In case it's a sub_lib, we don't link anything *) () - in - Format.fprintf - fmt - "%s%a" - header - (Format.pp_print_list - ~pp_sep:(fun pp () -> Format.fprintf pp "") - pp_registered) - @@ List.sort - (fun {name = name1; _} {name = name2; _} -> - String.compare - (String.capitalize_ascii name1) - (String.capitalize_ascii name2)) - registered_octez_libs + ~container:registered_octez_libs + ~package:"octez-libs" let octez_test_helpers = octez_lib @@ -2117,6 +1987,13 @@ let octez_base = ~js_compatible:true ~documentation:[Dune.[S "package"; S "octez-libs"]] ~dune:Dune.[ocamllex "point_parser"] + ~ocaml: + V.( + (* TODO: https://gitlab.com/tezos/tezos/-/issues/6112 + Should be in sync with scripts/version.sh *) + at_least "4.14.1" && less_than "4.15") + ~license:"Apache-2.0" + ~extra_authors:["WebAssembly Authors"] let octez_base_unix = octez_lib @@ -8275,9 +8152,14 @@ let () = write "script-inputs/active_protocol_versions_without_number" @@ fun fmt -> List.iter (write_protocol fmt) Protocol.active -(* Generate documentation index for Octez-libs *) +(* Generate documentation index for [octez-libs] *) let () = write "src/lib_base/index.mld" @@ fun fmt -> - pp_octez_libs_index fmt !registered_octez_libs + let header = + "{0 Octez-libs: Octez libraries}\n\n\ + This is a package containing some libraries used by the Octez project.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_libs let () = postcheck ~exclude () diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 9ddb6a2b2f1c..ecefeaa09c6a 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2153,6 +2153,207 @@ let add_dep_to_profile profile = function in profile_deps := String_map.add profile (dep :: old) !profile_deps +module Sub_lib = struct + type documentation_entrypoint = Module | Page | Sub_lib + + type sub_lib = { + name : string; + synopsis : string option; + documentation_type : documentation_entrypoint; + } + + type container = sub_lib list ref + + let make_container () = ref [] + + let make_documentation ~package ~public_name ~internal_name ~name ~synopsis = + function + | Some docs when not (docs = Dune.[[S "package"; S package]]) -> + {name; synopsis; documentation_type = Page} + | _ -> + (* In the case that the documentation stanza is only a package declaration, + we don't want the page to be used *) + if String.contains (Option.value ~default:public_name internal_name) '.' + then + { + name = String.capitalize_ascii name; + synopsis; + documentation_type = Sub_lib; + } + else + { + name = String.capitalize_ascii name; + synopsis; + documentation_type = Module; + } + + let pp_documentation pp = function + | {name; synopsis = None; documentation_type = Module} -> + Format.fprintf pp "- {{!module-%s}%s}@." name name + | {name; synopsis = Some synopsis; documentation_type = Module} -> + Format.fprintf pp "- {{!module-%s}%s}: %s@." name name synopsis + | {name; synopsis = None; documentation_type = Page} -> + Format.fprintf + pp + "- {{!page-%s}%s}@." + name + (String.capitalize_ascii name) + | {name; synopsis = Some synopsis; documentation_type = Page} -> + Format.fprintf + pp + "- {{!page-%s}%s}: %s@." + name + (String.capitalize_ascii name) + synopsis + | {documentation_type = Sub_lib; _} -> + (* In case it's a sub_lib, we don't link anything *) () + + (* Prints all the registered libs of a container package. *) + let pp_documentation_of_container ~header fmt registered_libs = + Format.fprintf + fmt + "%s%a" + header + (Format.pp_print_list ~pp_sep:(fun _ () -> ()) pp_documentation) + @@ List.sort + (fun {name = name1; _} {name = name2; _} -> + String.compare + (String.capitalize_ascii name1) + (String.capitalize_ascii name2)) + !registered_libs + + type maker = ?internal_name:string -> string Target.maker + + let sub_lib ~package_synopsis ~container ~package : maker = + fun ?internal_name + ?all_modules_except + ?bisect_ppx + ?c_library_flags + ?conflicts + ?deps + ?dune + ?flags + ?foreign_archives + ?foreign_stubs + ?ctypes + ?implements + ?inline_tests + ?js_compatible + ?js_of_ocaml + ?documentation + ?linkall + ?modes + ?modules + ?modules_without_implementation + ?npm_deps + ?ocaml + ?opam + ?opam_bug_reports + ?opam_doc + ?opam_homepage + ?opam_with_test + ?optional + ?preprocess + ?preprocessor_deps + ?private_modules + ?profile + ?opam_only_deps + ?release_status + ?static + ?synopsis + ?description + ?time_measurement_ppx + ?virtual_modules + ?default_implementation + ?cram + ?license + ?extra_authors + ?with_macos_security_framework + ~path + public_name -> + if Option.is_some opam then + invalid_arg "sub-libraries cannot be given custom `opam` parameters." ; + let name = + let s = Option.value ~default:public_name internal_name in + String.map + (function + | '-' | '.' -> '_' + | '/' -> + invalid_arg ("octez library " ^ s ^ " name cannot contain \"/\"") + | c -> c) + s + in + let registered = + make_documentation + ~package + ~public_name + ~internal_name + ~name + ~synopsis + documentation + in + if + List.exists + (fun registered -> String.equal registered.name name) + !container + then + invalid_arg + (Format.sprintf + "%s already contains a library that would have the same internal \ + name, %s, as %s" + package + (Option.value ~default:public_name internal_name) + name) + else container := registered :: !container ; + Target.public_lib + (package ^ "." ^ public_name) + ~path + ~internal_name:name + ~opam:package + ~synopsis:package_synopsis + ?all_modules_except + ?bisect_ppx + ?c_library_flags + ?conflicts + ?deps + ?dune + ?flags + ?foreign_archives + ?foreign_stubs + ?ctypes + ?implements + ?inline_tests + ?js_compatible + ?js_of_ocaml + ?documentation + ?linkall + ?modes + ?modules + ?modules_without_implementation + ?npm_deps + ?ocaml + ?opam_bug_reports + ?opam_doc + ?opam_homepage + ?opam_with_test + ?optional + ?preprocess + ?preprocessor_deps + ?private_modules + ?profile + ?opam_only_deps + ?release_status + ?static + ?description + ?time_measurement_ppx + ?virtual_modules + ?default_implementation + ?cram + ?license + ?extra_authors + ?with_macos_security_framework +end + (*****************************************************************************) (* GENERATOR *) (*****************************************************************************) diff --git a/manifest/manifest.mli b/manifest/manifest.mli index e91684db03a2..1570e5aa7564 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -1190,6 +1190,44 @@ val open_if : ?m:string -> bool -> target -> target actual package. *) val add_dep_to_profile : string -> target -> unit +(** This module is used to register multiple libraries (sub-libraries) + for a single container package. See + [https://dune.readthedocs.io/en/stable/concepts/package-spec.html#libraries] + for the corresponding dune feature. *) +module Sub_lib : sig + type documentation_entrypoint = Module | Page | Sub_lib + + type sub_lib = { + name : string; + synopsis : string option; + documentation_type : documentation_entrypoint; + } + + (** The type of a container for a set of sub-libraries *) + type container + + (** Create a container *) + val make_container : unit -> container + + (** A sub-lib [maker] is similar to a generic [maker] except that: + + - Passing a value for the [opam] parameter raises [Invalid_argument], + as all sub-libraires are necessarily restricted to a single opam + package. + + - The [internal_name] parameter can be given to set the internal name of the + library. *) + type nonrec maker = ?internal_name:string -> string maker + + (** Define a maker for sub-libraries of a given [container]. *) + val sub_lib : + package_synopsis:string -> container:container -> package:string -> maker + + (** Prints all the registered sub-libraries of a package. *) + val pp_documentation_of_container : + header:string -> Format.formatter -> container -> unit +end + (** Get a name for a given target, to display in errors. If a target has multiple names, one is chosen arbitrarily. -- GitLab From fec565ba42251e7662fe9931611e2a2c0dfbf1c0 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 10 Jul 2023 11:19:03 +0200 Subject: [PATCH 02/13] Manifest: Introduce octez-shell-libs --- manifest/main.ml | 24 +++++++++++++++++++++++- src/lib_shell/dune | 2 +- src/lib_shell/index.mld | 9 +++------ src/lib_shell/octez_shell.mld | 9 +++++++++ 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 src/lib_shell/octez_shell.mld diff --git a/manifest/main.ml b/manifest/main.ml index 38fc89b3d899..d734560fe152 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -456,6 +456,9 @@ let alcotezt = (* Container of the registered sublibraries of [octez-libs] *) let registered_octez_libs : Sub_lib.container = Sub_lib.make_container () +(* Container of the registered sublibraries of [octez-shell-libs] *) +let registered_octez_shell_libs : Sub_lib.container = Sub_lib.make_container () + (* Registers a sub-library in [octez-libs] packages. This package should contain all Octez basic libraries. *) let octez_lib : Sub_lib.maker = @@ -465,6 +468,14 @@ let octez_lib : Sub_lib.maker = ~container:registered_octez_libs ~package:"octez-libs" +(* Registers a sub-library in the [octez-shell-libs] package. + This package should contain all the libraries related to the shell. *) +let _octez_shell_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis:"Octez shell libraries" + ~container:registered_octez_shell_libs + ~package:"octez-shell-libs" + let octez_test_helpers = octez_lib "tezos-test-helpers" @@ -3366,7 +3377,8 @@ let octez_shell = ~synopsis: "Tezos: core of `octez-node` (gossip, validation scheduling, mempool, \ ...)" - ~documentation:[Dune.[S "package"; S "tezos-shell"]] + ~documentation: + Dune.[[S "package"; S "tezos-shell"]; [S "mld_files"; S "octez_shell"]] ~inline_tests:ppx_expect ~deps: [ @@ -8162,4 +8174,14 @@ let () = in Sub_lib.pp_documentation_of_container ~header fmt registered_octez_libs +(* Generate documentation index for [octez-shell-libs] *) +let () = + write "src/lib_shell/index.mld" @@ fun fmt -> + let header = + "{0 Octez-shell-libs: octez shell libraries}\n\n\ + This is a package containing some libraries used by the shell of Octez.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_shell_libs + let () = postcheck ~exclude () diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 4267e9359a4e..0fdfb9e17a83 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -53,4 +53,4 @@ -open Tezos_version -open Tezos_crypto_dal_octez_dal_config)) -(documentation (package tezos-shell)) +(documentation (package tezos-shell) (mld_files octez_shell)) diff --git a/src/lib_shell/index.mld b/src/lib_shell/index.mld index 28cad5959054..d251a906a1dd 100644 --- a/src/lib_shell/index.mld +++ b/src/lib_shell/index.mld @@ -1,9 +1,6 @@ -{0 tezos-shell index} +{0 Octez-shell-libs: octez shell libraries} -{1 Library tezos-shell} +This is a package containing some libraries used by the shell of Octez. -The entry point of this library is the module: {!Tezos_shell}. +It contains the following libraries: -{1 Prevalidator implementation overview} - -You can find the implementation overview of the prevalidator {{!page-prevalidator} here}. diff --git a/src/lib_shell/octez_shell.mld b/src/lib_shell/octez_shell.mld new file mode 100644 index 000000000000..28cad5959054 --- /dev/null +++ b/src/lib_shell/octez_shell.mld @@ -0,0 +1,9 @@ +{0 tezos-shell index} + +{1 Library tezos-shell} + +The entry point of this library is the module: {!Tezos_shell}. + +{1 Prevalidator implementation overview} + +You can find the implementation overview of the prevalidator {{!page-prevalidator} here}. -- GitLab From c448427e00a53076ec2b50feff711e690f650f55 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 10 Jul 2023 15:34:22 +0200 Subject: [PATCH 03/13] Manifest: Introduce octez-proto-libs --- manifest/main.ml | 22 ++++++++++++++++++++++ src/lib_protocol_environment/index.mld | 6 ++++++ 2 files changed, 28 insertions(+) create mode 100644 src/lib_protocol_environment/index.mld diff --git a/manifest/main.ml b/manifest/main.ml index d734560fe152..ba5f7863f602 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -459,6 +459,9 @@ let registered_octez_libs : Sub_lib.container = Sub_lib.make_container () (* Container of the registered sublibraries of [octez-shell-libs] *) let registered_octez_shell_libs : Sub_lib.container = Sub_lib.make_container () +(* Container of the registered sublibraries of [octez-proto-libs] *) +let registered_octez_proto_libs : Sub_lib.container = Sub_lib.make_container () + (* Registers a sub-library in [octez-libs] packages. This package should contain all Octez basic libraries. *) let octez_lib : Sub_lib.maker = @@ -476,6 +479,14 @@ let _octez_shell_lib : Sub_lib.maker = ~container:registered_octez_shell_libs ~package:"octez-shell-libs" +(* Registers a sub-library in the [octez-proto-libs] package. + This package should contain all the libraries related to the protocol. *) +let _octez_proto_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis:"Octez protocol libraries" + ~container:registered_octez_proto_libs + ~package:"octez-proto-libs" + let octez_test_helpers = octez_lib "tezos-test-helpers" @@ -8184,4 +8195,15 @@ let () = in Sub_lib.pp_documentation_of_container ~header fmt registered_octez_shell_libs +(* Generate documentation index for [octez-proto-libs] *) +let () = + write "src/lib_protocol_environment/index.mld" @@ fun fmt -> + let header = + "{0 Octez-proto-libs: octez protocol libraries}\n\n\ + This is a package containing some libraries related to the Tezos \ + protocol.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_proto_libs + let () = postcheck ~exclude () diff --git a/src/lib_protocol_environment/index.mld b/src/lib_protocol_environment/index.mld new file mode 100644 index 000000000000..2cc6c68e3ada --- /dev/null +++ b/src/lib_protocol_environment/index.mld @@ -0,0 +1,6 @@ +{0 Octez-proto-libs: octez protocol libraries} + +This is a package containing some libraries related to the Tezos protocol. + +It contains the following libraries: + -- GitLab From 47b059cc70d346618a1a32475152e55d1a711b9d Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Fri, 7 Jul 2023 15:51:12 +0200 Subject: [PATCH 04/13] Manifest: Introduce octez-l2-libs --- manifest/main.ml | 21 +++++++++++++++++++++ src/lib_smart_rollup/index.mld | 6 ++++++ 2 files changed, 27 insertions(+) create mode 100644 src/lib_smart_rollup/index.mld diff --git a/manifest/main.ml b/manifest/main.ml index ba5f7863f602..83f194267849 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -462,6 +462,9 @@ let registered_octez_shell_libs : Sub_lib.container = Sub_lib.make_container () (* Container of the registered sublibraries of [octez-proto-libs] *) let registered_octez_proto_libs : Sub_lib.container = Sub_lib.make_container () +(* Container of the registered sublibraries of [octez-l2-libs] *) +let registered_octez_l2_libs : Sub_lib.container = Sub_lib.make_container () + (* Registers a sub-library in [octez-libs] packages. This package should contain all Octez basic libraries. *) let octez_lib : Sub_lib.maker = @@ -487,6 +490,14 @@ let _octez_proto_lib : Sub_lib.maker = ~container:registered_octez_proto_libs ~package:"octez-proto-libs" +(* Registers a sub-library in the [octez-l2-libs] package. + This package should contain all the libraries related to layer 2. *) +let _octez_l2_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis:"Octez layer2 libraries" + ~container:registered_octez_l2_libs + ~package:"octez-l2-libs" + let octez_test_helpers = octez_lib "tezos-test-helpers" @@ -8206,4 +8217,14 @@ let () = in Sub_lib.pp_documentation_of_container ~header fmt registered_octez_proto_libs +(* Generate documentation index for Octez-l2-libs *) +let () = + write "src/lib_smart_rollup/index.mld" @@ fun fmt -> + let header = + "{0 Octez-l2-libs: octez layer2 libraries}\n\n\ + This is a package containing some libraries used by the layer 2 of Octez.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_l2_libs + let () = postcheck ~exclude () diff --git a/src/lib_smart_rollup/index.mld b/src/lib_smart_rollup/index.mld new file mode 100644 index 000000000000..bfb3472f26dc --- /dev/null +++ b/src/lib_smart_rollup/index.mld @@ -0,0 +1,6 @@ +{0 Octez-l2-libs: octez layer2 libraries} + +This is a package containing some libraries used by the layer 2 of Octez. + +It contains the following libraries: + -- GitLab From 175c1f69939363bb81073972329b0f9801e905be Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 13 Jul 2023 15:39:57 +0200 Subject: [PATCH 05/13] Manifest: Specific libs for protocol dependent shell and store tests --- .gitlab/ci/jobs/packaging/opam_package.yml | 4 +++ dune-project | 2 ++ manifest/main.ml | 12 +++++---- opam/octez-shell-tests.opam | 29 ++++++++++++++++++++ opam/octez-store-tests.opam | 31 ++++++++++++++++++++++ opam/tezos-shell.opam | 4 --- opam/tezos-store.opam | 7 ----- src/lib_shell/test/dune | 2 +- src/lib_store/unix/test/dune | 2 +- 9 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 opam/octez-shell-tests.opam create mode 100644 opam/octez-store-tests.opam diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 79a0d37c6d30..e47c56f2dafc 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -563,6 +563,8 @@ opam:octez-proxy-server: variables: package: octez-proxy-server +# Ignoring unreleased package octez-shell-tests. + opam:octez-signer: extends: - .opam_template @@ -635,6 +637,8 @@ opam:octez-smart-rollup-wasm-debugger: # Ignoring unreleased package octez-snoop. +# Ignoring unreleased package octez-store-tests. + # Ignoring unreleased package octez-testnet-scenarios. # Ignoring unreleased package octez-wasmer-test. diff --git a/dune-project b/dune-project index d961f8d41f65..c70ddc262c54 100644 --- a/dune-project +++ b/dune-project @@ -30,6 +30,7 @@ (package (name octez-node-config)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) +(package (name octez-shell-tests)(allow_empty)) (package (name octez-signer)) (package (name octez-smart-rollup)) (package (name octez-smart-rollup-client-Proxford)) @@ -46,6 +47,7 @@ (package (name octez-smart-rollup-wasm-benchmark-lib)(allow_empty)) (package (name octez-smart-rollup-wasm-debugger)) (package (name octez-snoop)) +(package (name octez-store-tests)(allow_empty)) (package (name octez-testnet-scenarios)) (package (name octez-wasmer-test)(allow_empty)) (package (name octogram)) diff --git a/manifest/main.ml b/manifest/main.ml index 83f194267849..a05c1cb555c2 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -6824,7 +6824,7 @@ let _octez_micheline_rewriting_tests = Protocol.(client_exn alpha); ] -let _octez_store_tests = +let octez_store_tests = tezt [ "test"; @@ -6844,7 +6844,8 @@ let _octez_store_tests = ] ~path:"src/lib_store/unix/test" ~with_macos_security_framework:true - ~opam:"tezos-store" + ~opam:"octez-store-tests" + ~synopsis:"Store tests" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6880,7 +6881,7 @@ let _octez_bench_store_lib_tests_exe = octez_base |> open_ ~m:"TzPervasives"; tezt_lib; alcotezt; - _octez_store_tests |> open_; + octez_store_tests |> open_; ] (* [_octez_slow_store_lib_tests_exe] is a very long test, running a huge @@ -6901,7 +6902,7 @@ let _octez_slow_store_lib_tests_exe = octez_base |> open_ ~m:"TzPervasives"; tezt_lib; alcotezt; - _octez_store_tests |> open_; + octez_store_tests |> open_; ] let _octez_shell_tests = @@ -6926,7 +6927,8 @@ let _octez_shell_tests = ] ~path:"src/lib_shell/test" ~with_macos_security_framework:true - ~opam:"tezos-shell" + ~opam:"octez-shell-tests" + ~synopsis:"Shell tests" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam new file mode 100644 index 000000000000..a4abaadb6a0b --- /dev/null +++ b/opam/octez-shell-tests.opam @@ -0,0 +1,29 @@ +# This file was automatically generated, do not edit. +# Edit file manifest/main.ml instead. +opam-version: "2.0" +maintainer: "contact@tezos.com" +authors: ["Tezos devteam"] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" +license: "MIT" +depends: [ + "dune" { >= "3.0" } + "ocaml" { >= "4.14" } + "tezt" { with-test & >= "3.1.1" } + "octez-libs" {with-test} + "tezos-store" {with-test} + "tezos-context-ops" {with-test} + "tezos-protocol-updater" {with-test} + "tezos-shell" {with-test} + "tezos-embedded-protocol-demo-noops" {with-test} + "tezos-validation" {with-test} + "octez-alcotezt" {with-test} + "tezos-version" {with-test} +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Shell tests" diff --git a/opam/octez-store-tests.opam b/opam/octez-store-tests.opam new file mode 100644 index 000000000000..cfcc5718bde5 --- /dev/null +++ b/opam/octez-store-tests.opam @@ -0,0 +1,31 @@ +# This file was automatically generated, do not edit. +# Edit file manifest/main.ml instead. +opam-version: "2.0" +maintainer: "contact@tezos.com" +authors: ["Tezos devteam"] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" +license: "MIT" +depends: [ + "dune" { >= "3.0" } + "ocaml" { >= "4.14" } + "tezt" { with-test & >= "3.1.1" } + "octez-libs" {with-test} + "tezos-context-ops" {with-test} + "tezos-store" {with-test} + "tezos-validation" {with-test} + "tezos-protocol-updater" {with-test} + "tezos-embedded-protocol-demo-noops" {with-test} + "tezos-embedded-protocol-genesis" {with-test} + "tezos-embedded-protocol-alpha" {with-test} + "tezos-protocol-alpha" {with-test} + "tezos-protocol-plugin-alpha" {with-test} + "octez-alcotezt" {with-test} +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Store tests" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index 86ef48d7cf0c..ccea28e6f97f 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -20,10 +20,6 @@ depends: [ "tezos-protocol-updater" "tezos-validation" "lwt-exit" - "tezt" { with-test & >= "3.1.1" } - "tezos-embedded-protocol-demo-noops" {with-test} - "octez-alcotezt" {with-test} - "tezos-version" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 59c74b872283..33f644bf688e 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -23,13 +23,6 @@ depends: [ "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } "prometheus" { >= "1.2" } - "tezt" { with-test & >= "3.1.1" } - "tezos-embedded-protocol-demo-noops" {with-test} - "tezos-embedded-protocol-genesis" {with-test} - "tezos-embedded-protocol-alpha" {with-test} - "tezos-protocol-alpha" {with-test} - "tezos-protocol-plugin-alpha" {with-test} - "octez-alcotezt" {with-test} ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 6de78b1250b8..20b1bd20df68 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -79,7 +79,7 @@ (rule (alias runtest) - (package tezos-shell) + (package octez-shell-tests) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 7786f907a0c3..482591531f53 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -73,7 +73,7 @@ (rule (alias runtest) - (package tezos-store) + (package octez-store-tests) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) -- GitLab From e729f074aa92c352bec18f6977925518f4db7106 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 10 Jul 2023 14:39:11 +0200 Subject: [PATCH 06/13] Manifest: Add libs to octez-shell-libs --- .gitlab/ci/jobs/packaging/opam_package.yml | 205 +++++------------- contrib/bin_codec/dune | 6 +- devtools/get_contracts/dune | 2 +- devtools/testnet_experiment_tools/dune | 16 +- devtools/yes_wallet/dune | 4 +- dune-project | 18 +- manifest/main.ml | 104 +++++---- opam/octez-accuser-Proxford.opam | 3 +- opam/octez-accuser-PtNairob.opam | 3 +- opam/octez-accuser-alpha.opam | 3 +- opam/octez-baker-Proxford.opam | 3 +- opam/octez-baker-PtNairob.opam | 3 +- opam/octez-baker-alpha.opam | 3 +- opam/octez-client.opam | 7 +- opam/octez-codec.opam | 4 +- opam/octez-crawler.opam | 3 +- opam/octez-dac-client.opam | 4 +- opam/octez-dac-node.opam | 5 +- opam/octez-dal-node.opam | 6 +- opam/octez-injector.opam | 3 +- opam/octez-libs.opam | 1 - opam/octez-node-config.opam | 3 +- opam/octez-node.opam | 5 +- opam/octez-proxy-server.opam | 2 +- ...tezos-store.opam => octez-shell-libs.opam} | 30 ++- opam/octez-shell-tests.opam | 6 +- opam/octez-signer.opam | 6 +- opam/octez-smart-rollup-client-Proxford.opam | 4 +- opam/octez-smart-rollup-client-PtNairob.opam | 4 +- opam/octez-smart-rollup-client-alpha.opam | 4 +- opam/octez-smart-rollup-node-Proxford.opam | 4 +- opam/octez-smart-rollup-node-PtNairob.opam | 4 +- opam/octez-smart-rollup-node-alpha.opam | 4 +- opam/octez-smart-rollup-node-lib.opam | 3 +- opam/octez-smart-rollup-node.opam | 4 +- opam/octez-smart-rollup-sequencer-node.opam | 4 +- opam/octez-smart-rollup-sequencer.opam | 2 +- opam/octez-snoop.opam | 2 +- opam/octez-store-tests.opam | 5 +- opam/tezos-017-PtNairob-test-helpers.opam | 1 + opam/tezos-018-Proxford-test-helpers.opam | 1 + opam/tezos-alpha-test-helpers.opam | 1 + opam/tezos-baking-017-PtNairob-commands.opam | 3 +- opam/tezos-baking-017-PtNairob.opam | 8 +- opam/tezos-baking-018-Proxford-commands.opam | 3 +- opam/tezos-baking-018-Proxford.opam | 8 +- opam/tezos-baking-alpha-commands.opam | 3 +- opam/tezos-baking-alpha.opam | 8 +- opam/tezos-benchmarks-proto-017-PtNairob.opam | 2 +- opam/tezos-benchmarks-proto-018-Proxford.opam | 2 +- opam/tezos-benchmarks-proto-alpha.opam | 2 +- opam/tezos-client-000-Ps9mPmXa.opam | 3 +- opam/tezos-client-001-PtCJ7pwo.opam | 4 +- opam/tezos-client-002-PsYLVpVv.opam | 4 +- opam/tezos-client-003-PsddFKi3.opam | 4 +- opam/tezos-client-004-Pt24m4xi.opam | 4 +- opam/tezos-client-005-PsBabyM1.opam | 4 +- opam/tezos-client-006-PsCARTHA.opam | 4 +- opam/tezos-client-007-PsDELPH1.opam | 4 +- opam/tezos-client-008-PtEdo2Zk.opam | 4 +- opam/tezos-client-009-PsFLoren.opam | 5 +- opam/tezos-client-010-PtGRANAD.opam | 5 +- opam/tezos-client-011-PtHangz2.opam | 9 +- opam/tezos-client-012-Psithaca.opam | 9 +- opam/tezos-client-013-PtJakart.opam | 9 +- opam/tezos-client-014-PtKathma.opam | 9 +- opam/tezos-client-015-PtLimaPt.opam | 9 +- opam/tezos-client-016-PtMumbai.opam | 9 +- opam/tezos-client-017-PtNairob.opam | 9 +- opam/tezos-client-018-Proxford.opam | 9 +- opam/tezos-client-alpha.opam | 9 +- opam/tezos-client-base-unix.opam | 32 --- opam/tezos-client-base.opam | 23 -- opam/tezos-client-commands.opam | 24 -- opam/tezos-client-demo-counter.opam | 3 +- opam/tezos-client-genesis.opam | 4 +- opam/tezos-context-ops.opam | 20 -- opam/tezos-dac-client-lib.opam | 3 +- opam/tezos-dac-lib.opam | 2 +- opam/tezos-dac-node-lib.opam | 3 +- opam/tezos-dal-node-lib.opam | 4 +- .../tezos-embedded-protocol-000-Ps9mPmXa.opam | 2 +- .../tezos-embedded-protocol-001-PtCJ7pwo.opam | 2 +- .../tezos-embedded-protocol-002-PsYLVpVv.opam | 2 +- .../tezos-embedded-protocol-003-PsddFKi3.opam | 2 +- .../tezos-embedded-protocol-004-Pt24m4xi.opam | 2 +- .../tezos-embedded-protocol-005-PsBABY5H.opam | 2 +- .../tezos-embedded-protocol-005-PsBabyM1.opam | 2 +- .../tezos-embedded-protocol-006-PsCARTHA.opam | 2 +- .../tezos-embedded-protocol-007-PsDELPH1.opam | 2 +- .../tezos-embedded-protocol-008-PtEdo2Zk.opam | 2 +- .../tezos-embedded-protocol-008-PtEdoTez.opam | 2 +- .../tezos-embedded-protocol-009-PsFLoren.opam | 2 +- .../tezos-embedded-protocol-010-PtGRANAD.opam | 2 +- .../tezos-embedded-protocol-011-PtHangz2.opam | 2 +- .../tezos-embedded-protocol-012-Psithaca.opam | 2 +- .../tezos-embedded-protocol-013-PtJakart.opam | 2 +- .../tezos-embedded-protocol-014-PtKathma.opam | 2 +- .../tezos-embedded-protocol-015-PtLimaPt.opam | 2 +- .../tezos-embedded-protocol-016-PtMumbai.opam | 2 +- .../tezos-embedded-protocol-017-PtNairob.opam | 2 +- .../tezos-embedded-protocol-018-Proxford.opam | 2 +- opam/tezos-embedded-protocol-alpha.opam | 2 +- .../tezos-embedded-protocol-demo-counter.opam | 2 +- opam/tezos-embedded-protocol-demo-noops.opam | 2 +- opam/tezos-embedded-protocol-genesis.opam | 2 +- opam/tezos-mockup-commands.opam | 24 -- opam/tezos-mockup-proxy.opam | 23 -- opam/tezos-mockup-registration.opam | 22 -- opam/tezos-mockup.opam | 27 --- opam/tezos-protocol-017-PtNairob-tests.opam | 2 +- opam/tezos-protocol-018-Proxford-tests.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 2 +- ...otocol-plugin-007-PsDELPH1-registerer.opam | 2 +- ...otocol-plugin-008-PtEdo2Zk-registerer.opam | 2 +- ...otocol-plugin-009-PsFLoren-registerer.opam | 2 +- ...otocol-plugin-010-PtGRANAD-registerer.opam | 2 +- ...otocol-plugin-011-PtHangz2-registerer.opam | 2 +- ...otocol-plugin-012-Psithaca-registerer.opam | 2 +- ...otocol-plugin-013-PtJakart-registerer.opam | 2 +- ...otocol-plugin-014-PtKathma-registerer.opam | 2 +- ...otocol-plugin-015-PtLimaPt-registerer.opam | 2 +- ...otocol-plugin-016-PtMumbai-registerer.opam | 2 +- ...otocol-plugin-017-PtNairob-registerer.opam | 2 +- ...otocol-plugin-018-Proxford-registerer.opam | 2 +- ...ezos-protocol-plugin-alpha-registerer.opam | 2 +- opam/tezos-protocol-updater.opam | 22 -- opam/tezos-proxy.opam | 30 --- opam/tezos-shell-benchmarks.opam | 21 -- opam/tezos-shell-context-test.opam | 22 -- opam/tezos-shell.opam | 29 --- opam/tezos-signer-backends.opam | 33 --- opam/tezos-signer-services.opam | 21 -- opam/tezos-tps-evaluation.opam | 2 +- opam/tezos-validation.opam | 23 -- src/bin_client/dune | 14 +- src/bin_dac_client/dune | 6 +- src/bin_dac_node/dune | 8 +- src/bin_dal_node/dune | 14 +- src/bin_node/dune | 16 +- src/bin_proxy_server/dune | 6 +- src/bin_sequencer_node/dune | 6 +- src/bin_signer/dune | 10 +- src/bin_smart_rollup_node/dune | 8 +- src/bin_snoop/dune | 2 +- src/bin_tps_evaluation/dune | 2 +- src/lib_base/index.mld | 3 - src/lib_client_base/dune | 4 +- src/lib_client_base/test/dune | 6 +- src/lib_client_base_unix/dune | 20 +- src/lib_client_base_unix/test/dune | 6 +- src/lib_client_commands/dune | 8 +- src/lib_crawler/dune | 4 +- src/lib_dac/dune | 2 +- src/lib_dac_client/dune | 4 +- src/lib_dac_node/dune | 4 +- src/lib_dal_node/dune | 6 +- src/lib_injector/dune | 4 +- src/lib_mockup/dune | 24 +- src/lib_mockup/test/dune | 8 +- src/lib_mockup_proxy/dune | 6 +- src/lib_node_config/dune | 6 +- src/lib_p2p/test/common/dune | 2 +- src/lib_p2p/test/dune | 22 +- src/lib_p2p/tezt/dune | 4 +- src/lib_protocol_environment/context_ops/dune | 4 +- .../shell_context/dune | 2 +- .../test_shell_context/dune | 4 +- src/lib_protocol_updater/dune | 6 +- src/lib_proxy/dune | 6 +- src/lib_proxy/rpc/dune | 8 +- src/lib_proxy/test/dune | 4 +- .../test_helpers/shell_services/dune | 2 +- .../test_helpers/shell_services/test/dune | 4 +- src/lib_scoru_sequencer/dune | 2 +- src/lib_shell/dune | 18 +- src/lib_shell/index.mld | 20 ++ src/lib_shell/test/dune | 16 +- src/lib_shell_benchmarks/dune | 4 +- src/lib_shell_services/dune | 2 +- src/lib_shell_services/test/dune | 6 +- src/lib_signer_backends/dune | 8 +- src/lib_signer_backends/test/dune | 6 +- src/lib_signer_backends/unix/dune | 10 +- src/lib_signer_backends/unix/test/dune | 6 +- src/lib_signer_services/dune | 4 +- src/lib_smart_rollup_node/dune | 4 +- src/lib_store/dune | 12 +- src/lib_store/mocked/dune | 14 +- src/lib_store/real/dune | 6 +- src/lib_store/shared/dune | 6 +- src/lib_store/unix/dune | 38 ++-- src/lib_store/unix/test/dune | 16 +- src/lib_validation/dune | 10 +- src/proto_000_Ps9mPmXa/lib_client/dune | 6 +- src/proto_000_Ps9mPmXa/lib_protocol/dune | 2 +- src/proto_001_PtCJ7pwo/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_001_PtCJ7pwo/lib_protocol/dune | 2 +- src/proto_002_PsYLVpVv/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_002_PsYLVpVv/lib_protocol/dune | 2 +- src/proto_003_PsddFKi3/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_003_PsddFKi3/lib_protocol/dune | 2 +- src/proto_004_Pt24m4xi/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_004_Pt24m4xi/lib_protocol/dune | 2 +- src/proto_005_PsBABY5H/lib_protocol/dune | 2 +- src/proto_005_PsBabyM1/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_005_PsBabyM1/lib_protocol/dune | 2 +- src/proto_006_PsCARTHA/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_006_PsCARTHA/lib_protocol/dune | 2 +- src/proto_007_PsDELPH1/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_007_PsDELPH1/lib_plugin/dune | 2 +- src/proto_007_PsDELPH1/lib_protocol/dune | 2 +- src/proto_008_PtEdo2Zk/lib_client/dune | 6 +- .../lib_client_commands/dune | 12 +- src/proto_008_PtEdo2Zk/lib_plugin/dune | 2 +- src/proto_008_PtEdo2Zk/lib_protocol/dune | 2 +- src/proto_008_PtEdoTez/lib_protocol/dune | 2 +- src/proto_009_PsFLoren/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_009_PsFLoren/lib_plugin/dune | 2 +- src/proto_009_PsFLoren/lib_protocol/dune | 2 +- src/proto_010_PtGRANAD/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_010_PtGRANAD/lib_plugin/dune | 2 +- src/proto_010_PtGRANAD/lib_protocol/dune | 2 +- src/proto_011_PtHangz2/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_011_PtHangz2/lib_plugin/dune | 2 +- src/proto_011_PtHangz2/lib_protocol/dune | 2 +- src/proto_012_Psithaca/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_012_Psithaca/lib_plugin/dune | 2 +- src/proto_012_Psithaca/lib_protocol/dune | 2 +- src/proto_013_PtJakart/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_013_PtJakart/lib_plugin/dune | 2 +- src/proto_013_PtJakart/lib_protocol/dune | 2 +- src/proto_014_PtKathma/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_014_PtKathma/lib_plugin/dune | 2 +- src/proto_014_PtKathma/lib_protocol/dune | 2 +- src/proto_015_PtLimaPt/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_015_PtLimaPt/lib_plugin/dune | 2 +- src/proto_015_PtLimaPt/lib_protocol/dune | 2 +- src/proto_016_PtMumbai/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_016_PtMumbai/lib_plugin/dune | 2 +- src/proto_016_PtMumbai/lib_protocol/dune | 2 +- src/proto_017_PtNairob/bin_accuser/dune | 4 +- src/proto_017_PtNairob/bin_baker/dune | 4 +- .../bin_sc_rollup_node/dune | 8 +- .../lib_benchmarks_proto/dune | 2 +- src/proto_017_PtNairob/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_017_PtNairob/lib_delegate/dune | 22 +- .../lib_delegate/test/mockup_simulator/dune | 10 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 2 +- src/proto_017_PtNairob/lib_plugin/dune | 2 +- src/proto_017_PtNairob/lib_protocol/dune | 2 +- .../lib_protocol/test/helpers/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- .../lib_sc_rollup_client/dune | 6 +- .../lib_sc_rollup_node/dune | 6 +- src/proto_018_Proxford/bin_accuser/dune | 4 +- src/proto_018_Proxford/bin_baker/dune | 4 +- .../bin_sc_rollup_node/dune | 8 +- .../lib_benchmarks_proto/dune | 2 +- src/proto_018_Proxford/lib_client/dune | 10 +- .../lib_client_commands/dune | 20 +- .../lib_client_sapling/dune | 4 +- src/proto_018_Proxford/lib_delegate/dune | 22 +- .../lib_delegate/test/mockup_simulator/dune | 10 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 2 +- src/proto_018_Proxford/lib_plugin/dune | 2 +- src/proto_018_Proxford/lib_protocol/dune | 2 +- .../lib_protocol/test/helpers/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- .../lib_sc_rollup_client/dune | 6 +- .../lib_sc_rollup_node/dune | 6 +- src/proto_alpha/bin_accuser/dune | 4 +- src/proto_alpha/bin_baker/dune | 4 +- src/proto_alpha/bin_sc_rollup_node/dune | 8 +- src/proto_alpha/lib_benchmarks_proto/dune | 2 +- src/proto_alpha/lib_client/dune | 10 +- src/proto_alpha/lib_client_commands/dune | 20 +- src/proto_alpha/lib_client_sapling/dune | 4 +- src/proto_alpha/lib_delegate/dune | 22 +- .../lib_delegate/test/mockup_simulator/dune | 10 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 2 +- src/proto_alpha/lib_plugin/dune | 2 +- src/proto_alpha/lib_protocol/dune | 2 +- .../lib_protocol/test/helpers/dune | 2 +- src/proto_alpha/lib_protocol/test/unit/dune | 2 +- src/proto_alpha/lib_sc_rollup_client/dune | 6 +- src/proto_alpha/lib_sc_rollup_node/dune | 6 +- src/proto_demo_counter/lib_client/dune | 6 +- src/proto_demo_counter/lib_protocol/dune | 2 +- src/proto_demo_noops/lib_protocol/dune | 2 +- src/proto_genesis/lib_client/dune | 8 +- src/proto_genesis/lib_protocol/dune | 2 +- 318 files changed, 898 insertions(+), 1550 deletions(-) rename opam/{tezos-store.opam => octez-shell-libs.opam} (59%) delete mode 100644 opam/tezos-client-base-unix.opam delete mode 100644 opam/tezos-client-base.opam delete mode 100644 opam/tezos-client-commands.opam delete mode 100644 opam/tezos-context-ops.opam delete mode 100644 opam/tezos-mockup-commands.opam delete mode 100644 opam/tezos-mockup-proxy.opam delete mode 100644 opam/tezos-mockup-registration.opam delete mode 100644 opam/tezos-mockup.opam delete mode 100644 opam/tezos-protocol-updater.opam delete mode 100644 opam/tezos-proxy.opam delete mode 100644 opam/tezos-shell-benchmarks.opam delete mode 100644 opam/tezos-shell-context-test.opam delete mode 100644 opam/tezos-shell.opam delete mode 100644 opam/tezos-signer-backends.opam delete mode 100644 opam/tezos-signer-services.opam delete mode 100644 opam/tezos-validation.opam diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index e47c56f2dafc..11945d2580c4 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -479,7 +479,7 @@ opam:octez-codec: opam:octez-crawler: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: octez-crawler @@ -524,7 +524,7 @@ opam:octez-distributed-lwt-internal: opam:octez-injector: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: octez-injector @@ -538,14 +538,14 @@ opam:octez-libs: opam:octez-node: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_2 + - .rules_template__trigger_exec_opam_batch_1 variables: package: octez-node opam:octez-node-config: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: octez-node-config @@ -559,16 +559,23 @@ opam:octez-protocol-compiler: opam:octez-proxy-server: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_1 + - .rules_template__trigger_exec_opam_batch_2 variables: package: octez-proxy-server +opam:octez-shell-libs: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_5 + variables: + package: octez-shell-libs + # Ignoring unreleased package octez-shell-tests. opam:octez-signer: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_2 + - .rules_template__trigger_exec_opam_batch_3 variables: package: octez-signer @@ -631,7 +638,7 @@ opam:octez-smart-rollup-node-lib: opam:octez-smart-rollup-wasm-debugger: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_1 + - .rules_template__trigger_exec_opam_batch_2 variables: package: octez-smart-rollup-wasm-debugger @@ -650,7 +657,7 @@ opam:octez-smart-rollup-wasm-debugger: opam:tezos-017-PtNairob-test-helpers: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-017-PtNairob-test-helpers @@ -710,7 +717,12 @@ opam:tezos-baking-alpha-commands: variables: package: tezos-baking-alpha-commands -# Ignoring unreleased package tezos-benchmark. +opam:tezos-benchmark: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_6 + variables: + package: tezos-benchmark # Ignoring unreleased package tezos-benchmark-017-PtNairob. @@ -800,122 +812,94 @@ opam:tezos-client-008-PtEdo2Zk: opam:tezos-client-009-PsFLoren: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-009-PsFLoren opam:tezos-client-010-PtGRANAD: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-010-PtGRANAD opam:tezos-client-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-011-PtHangz2 opam:tezos-client-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-012-Psithaca opam:tezos-client-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-013-PtJakart opam:tezos-client-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-014-PtKathma opam:tezos-client-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-015-PtLimaPt opam:tezos-client-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-016-PtMumbai opam:tezos-client-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-017-PtNairob opam:tezos-client-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-018-Proxford opam:tezos-client-alpha: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_2 - variables: - package: tezos-client-alpha - -opam:tezos-client-base: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-client-base - -opam:tezos-client-base-unix: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_3 - variables: - package: tezos-client-base-unix - -opam:tezos-client-commands: extends: - .opam_template - .rules_template__trigger_all_opam_batch_4 variables: - package: tezos-client-commands + package: tezos-client-alpha opam:tezos-client-demo-counter: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-demo-counter opam:tezos-client-genesis: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-genesis -opam:tezos-context-ops: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-context-ops - opam:tezos-dac-017-PtNairob: extends: - .opam_template @@ -956,7 +940,7 @@ opam:tezos-dac-lib: opam:tezos-dac-node-lib: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_1 variables: package: tezos-dac-node-lib @@ -971,7 +955,7 @@ opam:tezos-dac-node-lib: opam:tezos-dal-node-lib: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-dal-node-lib @@ -1104,21 +1088,21 @@ opam:tezos-embedded-protocol-014-PtKathma: opam:tezos-embedded-protocol-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-015-PtLimaPt opam:tezos-embedded-protocol-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-016-PtMumbai opam:tezos-embedded-protocol-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-017-PtNairob @@ -1186,34 +1170,6 @@ opam:tezos-layer2-utils-018-Proxford: # Ignoring unreleased package tezos-micheline-rewriting. -opam:tezos-mockup: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-mockup - -opam:tezos-mockup-commands: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_3 - variables: - package: tezos-mockup-commands - -opam:tezos-mockup-proxy: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-mockup-proxy - -opam:tezos-mockup-registration: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-mockup-registration - # Ignoring unreleased package tezos-openapi. opam:tezos-protocol-000-Ps9mPmXa: @@ -1310,7 +1266,7 @@ opam:tezos-protocol-010-PtGRANAD: opam:tezos-protocol-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-011-PtHangz2 @@ -1407,7 +1363,7 @@ opam:tezos-protocol-plugin-007-PsDELPH1: opam:tezos-protocol-plugin-007-PsDELPH1-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-007-PsDELPH1-registerer @@ -1421,7 +1377,7 @@ opam:tezos-protocol-plugin-008-PtEdo2Zk: opam:tezos-protocol-plugin-008-PtEdo2Zk-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-008-PtEdo2Zk-registerer @@ -1435,7 +1391,7 @@ opam:tezos-protocol-plugin-009-PsFLoren: opam:tezos-protocol-plugin-009-PsFLoren-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-009-PsFLoren-registerer @@ -1449,7 +1405,7 @@ opam:tezos-protocol-plugin-010-PtGRANAD: opam:tezos-protocol-plugin-010-PtGRANAD-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-010-PtGRANAD-registerer @@ -1463,7 +1419,7 @@ opam:tezos-protocol-plugin-011-PtHangz2: opam:tezos-protocol-plugin-011-PtHangz2-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-011-PtHangz2-registerer @@ -1477,7 +1433,7 @@ opam:tezos-protocol-plugin-012-Psithaca: opam:tezos-protocol-plugin-012-Psithaca-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-012-Psithaca-registerer @@ -1491,7 +1447,7 @@ opam:tezos-protocol-plugin-013-PtJakart: opam:tezos-protocol-plugin-013-PtJakart-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-013-PtJakart-registerer @@ -1505,21 +1461,21 @@ opam:tezos-protocol-plugin-014-PtKathma: opam:tezos-protocol-plugin-014-PtKathma-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-014-PtKathma-registerer opam:tezos-protocol-plugin-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-015-PtLimaPt opam:tezos-protocol-plugin-015-PtLimaPt-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-015-PtLimaPt-registerer @@ -1533,7 +1489,7 @@ opam:tezos-protocol-plugin-016-PtMumbai: opam:tezos-protocol-plugin-016-PtMumbai-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-016-PtMumbai-registerer @@ -1547,7 +1503,7 @@ opam:tezos-protocol-plugin-017-PtNairob: opam:tezos-protocol-plugin-017-PtNairob-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-017-PtNairob-registerer @@ -1563,7 +1519,7 @@ opam:tezos-protocol-plugin-018-Proxford: opam:tezos-protocol-plugin-018-Proxford-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-018-Proxford-registerer @@ -1579,26 +1535,12 @@ opam:tezos-protocol-plugin-alpha: opam:tezos-protocol-plugin-alpha-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-alpha-registerer # Ignoring unreleased package tezos-protocol-plugin-alpha-tests. -opam:tezos-protocol-updater: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-protocol-updater - -opam:tezos-proxy: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-proxy - opam:tezos-proxy-server-config: extends: - .opam_template @@ -1632,31 +1574,6 @@ opam:tezos-scoru-wasm-helpers: # Ignoring unreleased package tezos-scoru-wasm-test-helpers. -opam:tezos-shell: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_3 - variables: - package: tezos-shell - -# Ignoring unreleased package tezos-shell-benchmarks. - -# Ignoring unreleased package tezos-shell-context-test. - -opam:tezos-signer-backends: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-signer-backends - -opam:tezos-signer-services: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-signer-services - opam:tezos-smart-rollup-016-PtMumbai: extends: - .opam_template @@ -1703,26 +1620,12 @@ opam:tezos-smart-rollup-layer2-018-Proxford: # Ignoring unreleased package tezos-smart-rollup-layer2-alpha. -opam:tezos-store: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_4 - variables: - package: tezos-store - # Ignoring unreleased package tezos-tooling. # Ignoring unreleased package tezos-tps-evaluation. # Ignoring unreleased package tezos-tree-encoding-test. -opam:tezos-validation: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-validation - opam:tezos-version: extends: - .opam_template diff --git a/contrib/bin_codec/dune b/contrib/bin_codec/dune index ecb1a9e1c0f7..f5173cb96a92 100644 --- a/contrib/bin_codec/dune +++ b/contrib/bin_codec/dune @@ -10,12 +10,12 @@ data-encoding octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base-unix - tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-base octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-event-logging - tezos-signer-services + octez-shell-libs.tezos-signer-services tezos-version.value kaitai.kaitai-of-data-encoding kaitai.ast diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index ad80875a2bc0..c8c615235227 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -6,7 +6,7 @@ (libraries octez-libs.tezos-micheline octez-libs.tezos-base - tezos-store + octez-shell-libs.tezos-store tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-018-Proxford diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune index 69b4ecc75d21..ac68e047e712 100644 --- a/devtools/testnet_experiment_tools/dune +++ b/devtools/testnet_experiment_tools/dune @@ -6,7 +6,7 @@ (libraries tezt octez-libs.tezt-tezos - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix @@ -30,8 +30,8 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-baking-017-PtNairob tezos-client-017-PtNairob tezos-client-017-PtNairob.commands @@ -60,13 +60,13 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-store + octez-shell-libs.tezos-store octez-libs.tezos-clic - tezos-store.unix-snapshots - tezos-store.shared + octez-shell-libs.tezos-store.unix-snapshots + octez-shell-libs.tezos-store.shared octez-node-config - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix simulation_scenario_lib) (link_flags (:standard) diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 89454bdf4228..eb74ff5ff360 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -8,8 +8,8 @@ octez-libs.tezos-base.unix lwt.unix ezjsonm - tezos-store - octez-libs.tezos-shell-context + octez-shell-libs.tezos-store + octez-shell-libs.tezos-shell-context octez-libs.tezos-context tezos-protocol-017-PtNairob tezos-protocol-018-Proxford diff --git a/dune-project b/dune-project index c70ddc262c54..7da99a0ffef7 100644 --- a/dune-project +++ b/dune-project @@ -30,6 +30,7 @@ (package (name octez-node-config)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) +(package (name octez-shell-libs)) (package (name octez-shell-tests)(allow_empty)) (package (name octez-signer)) (package (name octez-smart-rollup)) @@ -93,12 +94,8 @@ (package (name tezos-client-017-PtNairob)) (package (name tezos-client-018-Proxford)) (package (name tezos-client-alpha)) -(package (name tezos-client-base)) -(package (name tezos-client-base-unix)) -(package (name tezos-client-commands)) (package (name tezos-client-demo-counter)) (package (name tezos-client-genesis)) -(package (name tezos-context-ops)) (package (name tezos-dac-017-PtNairob)) (package (name tezos-dac-018-Proxford)) (package (name tezos-dac-alpha)) @@ -144,10 +141,6 @@ (package (name tezos-layer2-utils-alpha)) (package (name tezos-lazy-containers-tests)(allow_empty)) (package (name tezos-micheline-rewriting)) -(package (name tezos-mockup)) -(package (name tezos-mockup-commands)) -(package (name tezos-mockup-proxy)) -(package (name tezos-mockup-registration)) (package (name tezos-openapi)) (package (name tezos-protocol-000-Ps9mPmXa)) (package (name tezos-protocol-001-PtCJ7pwo)) @@ -206,8 +199,6 @@ (package (name tezos-protocol-plugin-alpha)) (package (name tezos-protocol-plugin-alpha-registerer)) (package (name tezos-protocol-plugin-alpha-tests)(allow_empty)) -(package (name tezos-protocol-updater)) -(package (name tezos-proxy)) (package (name tezos-proxy-server-config)) (package (name tezos-sc-rollup-node-test)(allow_empty)) (package (name tezos-scoru-wasm-durable-snapshot)(allow_empty)) @@ -217,11 +208,6 @@ (package (name tezos-scoru-wasm-regressions)(allow_empty)) (package (name tezos-scoru-wasm-test)(allow_empty)) (package (name tezos-scoru-wasm-test-helpers)(allow_empty)) -(package (name tezos-shell)) -(package (name tezos-shell-benchmarks)) -(package (name tezos-shell-context-test)(allow_empty)) -(package (name tezos-signer-backends)) -(package (name tezos-signer-services)) (package (name tezos-smart-rollup-016-PtMumbai)) (package (name tezos-smart-rollup-017-PtNairob)) (package (name tezos-smart-rollup-018-Proxford)) @@ -230,11 +216,9 @@ (package (name tezos-smart-rollup-layer2-017-PtNairob)) (package (name tezos-smart-rollup-layer2-018-Proxford)) (package (name tezos-smart-rollup-layer2-alpha)) -(package (name tezos-store)) (package (name tezos-tooling)) (package (name tezos-tps-evaluation)) (package (name tezos-tree-encoding-test)(allow_empty)) -(package (name tezos-validation)) (package (name tezos-version)) (package (name tezos-wasmer)) (package (name tezos-webassembly-interpreter-extra)) diff --git a/manifest/main.ml b/manifest/main.ml index a05c1cb555c2..dd0b995165ce 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -476,7 +476,7 @@ let octez_lib : Sub_lib.maker = (* Registers a sub-library in the [octez-shell-libs] package. This package should contain all the libraries related to the shell. *) -let _octez_shell_lib : Sub_lib.maker = +let octez_shell_lib : Sub_lib.maker = Sub_lib.sub_lib ~package_synopsis:"Octez shell libraries" ~container:registered_octez_shell_libs @@ -2343,7 +2343,7 @@ let octez_merkle_proof_encoding = ~js_compatible:true let octez_shell_services = - octez_lib + octez_shell_lib "tezos-shell-services" ~path:"src/lib_shell_services" ~synopsis:"Descriptions of RPCs exported by [tezos-shell]" @@ -2364,7 +2364,7 @@ let _octez_shell_services_tests = tezt ["test_block_services"] ~path:"src/lib_shell_services/test" - ~opam:"octez-libs" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2454,7 +2454,7 @@ let tezt_tezos = ~release_status:Released let octez_p2p_test_common = - octez_lib + octez_shell_lib "tezos_p2p_test_common" ~path:"src/lib_p2p/test/common" ~deps: @@ -2472,7 +2472,7 @@ let _octez_p2p_tezt = tezt ["test_p2p_fd"; "test_p2p_socket"; "test_p2p_conn"] ~path:"src/lib_p2p/tezt" - ~opam:"octez-libs" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2503,7 +2503,7 @@ let _octez_p2p_tests = ] ~bisect_ppx:With_sigterm ~path:"src/lib_p2p/test" - ~opam:"octez-libs" + ~opam:"octez-shell-libs" ~locks:"/locks/p2p" ~deps: [ @@ -2964,7 +2964,7 @@ let octez_protocol_environment = ] let octez_shell_context = - octez_lib + octez_shell_lib "tezos-shell-context" ~path:"src/lib_protocol_environment/shell_context" ~deps: @@ -2997,10 +2997,10 @@ let _octez_protocol_environment_tests = ] let octez_context_ops = - public_lib + octez_shell_lib "tezos-context-ops" ~path:"src/lib_protocol_environment/context_ops" - ~synopsis:"Tezos: backend-agnostic operations on contexts" + ~synopsis:"Backend-agnostic operations on contexts" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3014,8 +3014,7 @@ let _octez_protocol_shell_context_tests = tezt ["test_proxy_context"] ~path:"src/lib_protocol_environment/test_shell_context" - ~opam:"tezos-shell-context-test" - ~synopsis:"Testing the Shell Context" + ~opam:"octez-shell-libs" ~deps: [ octez_shell_context; @@ -3173,10 +3172,10 @@ let octez_protocol_compiler_native = ] let octez_protocol_updater = - public_lib + octez_shell_lib "tezos-protocol-updater" ~path:"src/lib_protocol_updater" - ~synopsis:"Tezos: economic-protocol dynamic loading for `octez-node`" + ~synopsis:"Economic-protocol dynamic loading for `octez-node`" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3193,10 +3192,10 @@ let octez_protocol_updater = ] let octez_validation = - public_lib + octez_shell_lib "tezos-validation" ~path:"src/lib_validation" - ~synopsis:"Tezos: library for block validation" + ~synopsis:"Library for block validation" ~time_measurement_ppx:true ~deps: [ @@ -3213,7 +3212,7 @@ let octez_validation = ] let octez_store_shared = - public_lib + octez_shell_lib "tezos-store.shared" ~path:"src/lib_store/shared" ~deps: @@ -3237,7 +3236,7 @@ let octez_store_shared = ] let octez_store_unix = - public_lib + octez_shell_lib "tezos-store.unix" ~path:"src/lib_store/unix" ~deps: @@ -3280,7 +3279,7 @@ let octez_store_unix = ~conflicts:[Conflicts.checkseum] let octez_store_unix_reconstruction = - public_lib + octez_shell_lib "tezos-store.unix-reconstruction" ~path:"src/lib_store/unix" ~deps: @@ -3298,7 +3297,7 @@ let octez_store_unix_reconstruction = ~modules:["reconstruction"; "reconstruction_events"] let octez_store_unix_snapshots = - public_lib + octez_shell_lib "tezos-store.unix-snapshots" ~path:"src/lib_store/unix" ~deps: @@ -3315,15 +3314,10 @@ let octez_store_unix_snapshots = ~modules:["snapshots"; "snapshots_events"] let octez_store = - public_lib + octez_shell_lib "tezos-store" ~path:"src/lib_store" - ~synopsis:"Tezos: store for `octez-node`" - ~description: - {|This library provides abstraction for storing and iterating over blocks. -tezos-store is a virtual library that provides two implementations: -- tezos-store.real is the default implementation, used in production -- tezos-store.mocked is used for testing purposes.|} + ~synopsis:"Store for `octez-node`" ~deps: [ octez_base |> open_ |> open_ ~m:"TzPervasives"; @@ -3336,18 +3330,18 @@ tezos-store is a virtual library that provides two implementations: octez_store_shared |> open_; ] ~virtual_modules:["store"] - ~default_implementation:"tezos-store.real" + ~default_implementation:"octez-shell-libs.tezos-store.real" let _octez_store_real = - public_lib + octez_shell_lib "tezos-store.real" ~path:"src/lib_store/real" ~deps:[octez_store_unix |> open_] ~implements:octez_store let _octez_store_mocked = - public_lib - "tezos-store.mocked" + octez_shell_lib + "mocked" ~path:"src/lib_store/mocked" ~deps: [ @@ -3393,14 +3387,14 @@ let _octez_requester_tests = ] let octez_shell = - public_lib + octez_shell_lib "tezos-shell" ~path:"src/lib_shell" ~synopsis: - "Tezos: core of `octez-node` (gossip, validation scheduling, mempool, \ - ...)" + "Core of `octez-node` (gossip, validation scheduling, mempool, ...)" ~documentation: - Dune.[[S "package"; S "tezos-shell"]; [S "mld_files"; S "octez_shell"]] + Dune. + [[S "package"; S "octez-shell-libs"]; [S "mld_files"; S "octez_shell"]] ~inline_tests:ppx_expect ~deps: [ @@ -3503,7 +3497,7 @@ let _octez_rpc_http_server_tests = ] let octez_client_base = - public_lib + octez_shell_lib "tezos-client-base" ~path:"src/lib_client_base" ~synopsis:"Tezos: common helpers for `tezos-client`" @@ -3536,7 +3530,7 @@ let _octez_client_base_tests = tezt ["bip39_tests"; "pbkdf_tests"] ~path:"src/lib_client_base/test" - ~opam:"tezos-client-base" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps:[octez_base; octez_client_base |> open_; alcotezt] ~js_compatible:true @@ -3546,11 +3540,11 @@ let _bip39_generator = private_exe "bip39_generator" ~path:"src/lib_client_base/gen" - ~opam:"tezos-client-base" + ~opam:"octez-shell-libs" ~bisect_ppx:No let octez_signer_services = - public_lib + octez_shell_lib "tezos-signer-services" ~path:"src/lib_signer_services" ~synopsis:"Tezos: descriptions of RPCs exported by `tezos-signer`" @@ -3564,7 +3558,7 @@ let octez_signer_services = ~js_compatible:true let octez_signer_backends = - public_lib + octez_shell_lib "tezos-signer-backends" ~path:"src/lib_signer_backends" ~synopsis:"Tezos: remote-signature backends for `tezos-client`" @@ -3584,7 +3578,7 @@ let _octez_signer_backends_tests = tezt ["test_encrypted"] ~path:"src/lib_signer_backends/test" - ~opam:"tezos-signer-backends" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -3600,7 +3594,7 @@ let _octez_signer_backends_tests = ] let octez_signer_backends_unix = - public_lib + octez_shell_lib "tezos-signer-backends.unix" ~path:"src/lib_signer_backends/unix" ~deps: @@ -3631,7 +3625,7 @@ let _octez_signer_backends_unix_tests = tezt ["test_crouching"] ~path:"src/lib_signer_backends/unix/test" - ~opam:"tezos-signer-backends" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -3644,7 +3638,7 @@ let _octez_signer_backends_unix_tests = ] let octez_client_commands = - public_lib + octez_shell_lib "tezos-client-commands" ~path:"src/lib_client_commands" ~synopsis:"Tezos: protocol agnostic commands for `tezos-client`" @@ -3666,7 +3660,7 @@ let octez_client_commands = ~linkall:true let octez_mockup_registration = - public_lib + octez_shell_lib "tezos-mockup-registration" ~path:"src/lib_mockup" ~synopsis:"Tezos: protocol registration for the mockup mode" @@ -3681,7 +3675,7 @@ let octez_mockup_registration = ~modules:["registration"; "registration_intf"; "mockup_args"] let octez_mockup_proxy = - public_lib + octez_shell_lib "tezos-mockup-proxy" ~path:"src/lib_mockup_proxy" ~synopsis:"Tezos: local RPCs" @@ -3699,7 +3693,7 @@ let octez_mockup_proxy = (* Depends on tezos_p2p to register the relevant RPCs. *) let octez_mockup = - public_lib + octez_shell_lib "tezos-mockup" ~path:"src/lib_mockup" ~synopsis:"Tezos: library of auto-documented RPCs (mockup mode)" @@ -3730,7 +3724,7 @@ let octez_mockup = ] let octez_mockup_commands = - public_lib + octez_shell_lib "tezos-mockup-commands" ~path:"src/lib_mockup" ~synopsis:"Tezos: library of auto-documented RPCs (commands)" @@ -3749,7 +3743,7 @@ let _octez_mockup_tests = tezt ["test_mockup_args"; "test_fuzzing_mockup_args"; "test_persistence"] ~path:"src/lib_mockup/test" - ~opam:"tezos-mockup" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -3765,7 +3759,7 @@ let _octez_mockup_tests = ] let octez_proxy = - public_lib + octez_shell_lib "tezos-proxy" ~path:"src/lib_proxy" ~synopsis:"Tezos: proxy" @@ -3784,7 +3778,7 @@ let octez_proxy = ] let octez_proxy_rpc = - public_lib + octez_shell_lib "tezos-proxy.rpc" ~path:"src/lib_proxy/rpc" ~deps: @@ -3820,7 +3814,7 @@ let _octez_shell_service_test_helpers_tests = tezt ["test_block_services"] ~path:"src/lib_proxy/test_helpers/shell_services/test" - ~opam:"tezos-proxy" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3843,7 +3837,7 @@ let _octez_proxy_tests = ] ~path:"src/lib_proxy/test" ~with_macos_security_framework:true - ~opam:"tezos-proxy" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3882,7 +3876,7 @@ let _octez_proxy_server_config_tests = ] let octez_client_base_unix = - public_lib + octez_shell_lib "tezos-client-base-unix" ~path:"src/lib_client_base_unix" ~synopsis: @@ -3915,7 +3909,7 @@ let _octez_client_base_unix_tests = tezt ["test_mockup_wallet"] ~path:"src/lib_client_base_unix/test" - ~opam:"tezos-client-base-unix" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -4011,7 +4005,7 @@ let octez_micheline_rewriting = ] let octez_shell_benchmarks = - public_lib + octez_shell_lib "tezos-shell-benchmarks" ~path:"src/lib_shell_benchmarks" ~synopsis:"Tezos: shell benchmarks" diff --git a/opam/octez-accuser-Proxford.opam b/opam/octez-accuser-Proxford.opam index 15d5c0888643..69d9a1eba9f7 100644 --- a/opam/octez-accuser-Proxford.opam +++ b/opam/octez-accuser-Proxford.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-018-Proxford-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam index 35b3388c8172..4b3eac034c0c 100644 --- a/opam/octez-accuser-PtNairob.opam +++ b/opam/octez-accuser-PtNairob.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-017-PtNairob-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 2ab6daa9abe9..f173068a0123 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-alpha-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-baker-Proxford.opam b/opam/octez-baker-Proxford.opam index 40d68ed7c3c3..dca034ff1a02 100644 --- a/opam/octez-baker-Proxford.opam +++ b/opam/octez-baker-Proxford.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-018-Proxford-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam index 1926b5efce24..84a6d8c0d326 100644 --- a/opam/octez-baker-PtNairob.opam +++ b/opam/octez-baker-PtNairob.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-017-PtNairob-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index a72c8cf6bf0a..e35c44e60cbb 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-alpha-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-client.opam b/opam/octez-client.opam index 9416cd18c5e0..e8a4fcd85a7d 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -11,12 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-commands" - "tezos-mockup-commands" - "tezos-proxy" - "tezos-client-base-unix" - "tezos-signer-backends" + "octez-shell-libs" "uri" { >= "3.1.0" } "tezos-client-017-PtNairob" "tezos-baking-017-PtNairob-commands" diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 71e62e2c525b..da82900753db 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "data-encoding" { >= "0.7.1" & < "1.0.0" } "octez-libs" - "tezos-client-base-unix" - "tezos-client-base" - "tezos-signer-services" + "octez-shell-libs" "tezos-version" "kaitai" ] diff --git a/opam/octez-crawler.opam b/opam/octez-crawler.opam index 2e857feeec5a..b24176a045e1 100644 --- a/opam/octez-crawler.opam +++ b/opam/octez-crawler.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-shell" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam index 6d74583887a0..399cea91bf0f 100644 --- a/opam/octez-dac-client.opam +++ b/opam/octez-dac-client.opam @@ -11,9 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" + "octez-shell-libs" "tezos-dac-lib" "tezos-dac-client-lib" "tezos-dac-017-PtNairob" diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index a9aa92d0c749..147136c3b1d1 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -11,10 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "tezos-protocol-updater" + "octez-shell-libs" "tezos-dac-lib" "tezos-dac-node-lib" "tezos-layer2-store" diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 85cd75a80103..208cef65c47e 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -12,14 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "cmdliner" { >= "1.1.0" } - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "tezos-protocol-updater" + "octez-shell-libs" "tezos-dal-node-lib" "tezos-dal-node-services" "tezos-layer2-store" - "tezos-store" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "prometheus-app" { >= "1.2" } diff --git a/opam/octez-injector.opam b/opam/octez-injector.opam index 05b1a0389e65..9df0938b4b3c 100644 --- a/opam/octez-injector.opam +++ b/opam/octez-injector.opam @@ -12,8 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "logs" - "tezos-client-base" - "tezos-shell" + "octez-shell-libs" "octez-crawler" ] build: [ diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index c007b112fb02..3a86d28b28b4 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -57,7 +57,6 @@ depends: [ "prometheus" { >= "1.2" } "tezt" { >= "3.1.1" } "cohttp-lwt-unix" { >= "5.2.0" } - "astring" {with-test} "qcheck-core" {with-test} "irmin" { >= "3.7.2" & < "3.8.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } diff --git a/opam/octez-node-config.opam b/opam/octez-node-config.opam index aa0bd99ddbc6..a07067925ac9 100644 --- a/opam/octez-node-config.opam +++ b/opam/octez-node-config.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-store" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 8f1bd14da295..6d6f0cbcd341 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -13,10 +13,7 @@ depends: [ "octez-libs" "tezos-version" "octez-node-config" - "tezos-shell" - "tezos-store" - "tezos-validation" - "tezos-protocol-updater" + "octez-shell-libs" "cmdliner" { >= "1.1.0" } "fmt" { >= "0.8.7" } "tls-lwt" { >= "0.16.0" } diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index 1bad689fb93e..cc6c9c617846 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -14,7 +14,7 @@ depends: [ "cmdliner" { >= "1.1.0" } "lwt-exit" "lwt" { >= "5.7.0" } - "tezos-proxy" + "octez-shell-libs" "tezos-proxy-server-config" "tezos-version" "uri" { >= "3.1.0" } diff --git a/opam/tezos-store.opam b/opam/octez-shell-libs.opam similarity index 59% rename from opam/tezos-store.opam rename to opam/octez-shell-libs.opam index 33f644bf688e..c9f207bdb004 100644 --- a/opam/tezos-store.opam +++ b/opam/octez-shell-libs.opam @@ -11,29 +11,43 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" + "tezt" { >= "3.1.1" } + "octez-alcotezt" {with-test} + "astring" {with-test} + "octez-protocol-compiler" + "lwt-exit" + "tezos-version" "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } - "tezos-validation" "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } - "tezos-context-ops" - "tezos-protocol-updater" "lwt-watcher" { = "0.2" } "camlzip" { >= "1.11" & < "1.12" } "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } "prometheus" { >= "1.2" } + "ppx_expect" + "lwt-canceler" { >= "0.3" & < "0.4" } + "uri" { >= "3.1.0" } + "ocplib-endian" + "fmt" { >= "0.8.7" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "resto-cohttp-self-serving-client" { >= "1.2" } + "tezos-benchmark" + "qcheck-alcotest" { with-test & >= "0.20" } + "qcheck-core" {with-test} + "lwt" { with-test & >= "5.7.0" } +] +depopts: [ + "ledgerwallet-tezos" ] conflicts: [ "checkseum" { = "0.5.0" } + "ledgerwallet-tezos" { < "0.3.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos: store for `octez-node`" -description: "This library provides abstraction for storing and iterating over blocks. -tezos-store is a virtual library that provides two implementations: -- tezos-store.real is the default implementation, used in production -- tezos-store.mocked is used for testing purposes." +synopsis: "Octez shell libraries" diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam index a4abaadb6a0b..a6bad8f45540 100644 --- a/opam/octez-shell-tests.opam +++ b/opam/octez-shell-tests.opam @@ -12,12 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-store" {with-test} - "tezos-context-ops" {with-test} - "tezos-protocol-updater" {with-test} - "tezos-shell" {with-test} + "octez-shell-libs" {with-test} "tezos-embedded-protocol-demo-noops" {with-test} - "tezos-validation" {with-test} "octez-alcotezt" {with-test} "tezos-version" {with-test} ] diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index 7276f2211dd4..5c241a796622 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -11,11 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "tezos-signer-services" - "tezos-signer-backends" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam index f8e80071df13..5ff313e07430 100644 --- a/opam/octez-smart-rollup-client-Proxford.opam +++ b/opam/octez-smart-rollup-client-Proxford.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-018-Proxford" - "tezos-client-commands" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-018-Proxford" "octez-smart-rollup" "tezos-smart-rollup-018-Proxford" diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index 1de22e4f4889..9f1d2c5ff759 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-client-commands" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-017-PtNairob" "octez-smart-rollup" "tezos-smart-rollup-017-PtNairob" diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index 8f57380aff34..0782432d52a6 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-alpha" - "tezos-client-commands" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-alpha" "octez-smart-rollup" "tezos-smart-rollup-alpha" diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam index 5badc529bcdb..ccc3d4e64653 100644 --- a/opam/octez-smart-rollup-node-Proxford.opam +++ b/opam/octez-smart-rollup-node-Proxford.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-018-Proxford" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" @@ -36,7 +35,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm-fast" "tezos-version" - "tezos-client-commands" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index d53b4c4c1bf8..755921ae446b 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-017-PtNairob" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" @@ -34,7 +33,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm-fast" "tezos-version" - "tezos-client-commands" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index ceccf5bc7a91..9dc86d46b097 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-alpha" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" @@ -36,7 +35,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm-fast" "tezos-version" - "tezos-client-commands" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-lib.opam b/opam/octez-smart-rollup-node-lib.opam index 6cd0d47ac685..8005adceeab7 100644 --- a/opam/octez-smart-rollup-node-lib.opam +++ b/opam/octez-smart-rollup-node-lib.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "cohttp-lwt-unix" { >= "5.2.0" } "octez-node-config" "prometheus-app" { >= "1.2" } diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam index 3f1c2a66c690..fb25f031c486 100644 --- a/opam/octez-smart-rollup-node.opam +++ b/opam/octez-smart-rollup-node.opam @@ -11,9 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" + "octez-shell-libs" "octez-smart-rollup" "octez-smart-rollup-node-lib" "octez-smart-rollup-node-PtNairob" diff --git a/opam/octez-smart-rollup-sequencer-node.opam b/opam/octez-smart-rollup-sequencer-node.opam index 087fe6c3a87b..3c5ca005d43a 100644 --- a/opam/octez-smart-rollup-sequencer-node.opam +++ b/opam/octez-smart-rollup-sequencer-node.opam @@ -11,9 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" + "octez-shell-libs" "octez-smart-rollup-node-lib" "tezos-client-alpha" "octez-smart-rollup-node-alpha" diff --git a/opam/octez-smart-rollup-sequencer.opam b/opam/octez-smart-rollup-sequencer.opam index 176ad82535e2..9b3d8da6808e 100644 --- a/opam/octez-smart-rollup-sequencer.opam +++ b/opam/octez-smart-rollup-sequencer.opam @@ -16,7 +16,7 @@ depends: [ "octez-smart-rollup-node-alpha" "octez-smart-rollup-node-lib" "octez-smart-rollup" - "tezos-client-base" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index e0d4517c5b3f..d6f5e2fba0e6 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-benchmark" "tezos-benchmark-examples" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-benchmarks-proto-alpha" "pyml" "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/octez-store-tests.opam b/opam/octez-store-tests.opam index cfcc5718bde5..20a9588fa5e5 100644 --- a/opam/octez-store-tests.opam +++ b/opam/octez-store-tests.opam @@ -12,10 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-context-ops" {with-test} - "tezos-store" {with-test} - "tezos-validation" {with-test} - "tezos-protocol-updater" {with-test} + "octez-shell-libs" {with-test} "tezos-embedded-protocol-demo-noops" {with-test} "tezos-embedded-protocol-genesis" {with-test} "tezos-embedded-protocol-alpha" {with-test} diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam index 1c0dc011b687..be975f03d838 100644 --- a/opam/tezos-017-PtNairob-test-helpers.opam +++ b/opam/tezos-017-PtNairob-test-helpers.opam @@ -15,6 +15,7 @@ depends: [ "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-018-Proxford-test-helpers.opam b/opam/tezos-018-Proxford-test-helpers.opam index 4466d5d2adba..4f3a7dc9071e 100644 --- a/opam/tezos-018-Proxford-test-helpers.opam +++ b/opam/tezos-018-Proxford-test-helpers.opam @@ -15,6 +15,7 @@ depends: [ "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" "tezos-protocol-plugin-018-Proxford" + "octez-shell-libs" "tezos-smart-rollup-018-Proxford" ] build: [ diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 50d55b2c8674..214b722d92a6 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -15,6 +15,7 @@ depends: [ "tezos-protocol-alpha" "tezos-client-alpha" "tezos-protocol-plugin-alpha" + "octez-shell-libs" "tezos-smart-rollup-alpha" ] build: [ diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam index 393bb6ebbc3d..821b15ea9b9c 100644 --- a/opam/tezos-baking-017-PtNairob-commands.opam +++ b/opam/tezos-baking-017-PtNairob-commands.opam @@ -12,9 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-client-base" + "octez-shell-libs" "tezos-client-017-PtNairob" - "tezos-client-commands" "tezos-baking-017-PtNairob" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index 54cce7f24fd7..89e33af8b7a8 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -14,19 +14,13 @@ depends: [ "tezos-version" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-client-base" + "octez-shell-libs" "tezos-client-017-PtNairob" - "tezos-client-commands" - "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-client-base-unix" - "tezos-mockup" - "tezos-mockup-proxy" - "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-baking-018-Proxford-commands.opam b/opam/tezos-baking-018-Proxford-commands.opam index 05aa41bcb1a0..647959d6768a 100644 --- a/opam/tezos-baking-018-Proxford-commands.opam +++ b/opam/tezos-baking-018-Proxford-commands.opam @@ -12,9 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-018-Proxford" - "tezos-client-base" + "octez-shell-libs" "tezos-client-018-Proxford" - "tezos-client-commands" "tezos-baking-018-Proxford" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-baking-018-Proxford.opam b/opam/tezos-baking-018-Proxford.opam index d5d71f06cc10..b90855b8a4d8 100644 --- a/opam/tezos-baking-018-Proxford.opam +++ b/opam/tezos-baking-018-Proxford.opam @@ -14,19 +14,13 @@ depends: [ "tezos-version" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-client-base" + "octez-shell-libs" "tezos-client-018-Proxford" - "tezos-client-commands" - "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-client-base-unix" - "tezos-mockup" - "tezos-mockup-proxy" - "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index 85dd1b335806..164ebde22c21 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -12,9 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-alpha" - "tezos-client-base" + "octez-shell-libs" "tezos-client-alpha" - "tezos-client-commands" "tezos-baking-alpha" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 1f9cda0f66a7..0fe4c7f8a2ce 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -14,19 +14,13 @@ depends: [ "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-client-base" + "octez-shell-libs" "tezos-client-alpha" - "tezos-client-commands" - "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-client-base-unix" - "tezos-mockup" - "tezos-mockup-proxy" - "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam index cfd6fa020449..05c583edaf29 100644 --- a/opam/tezos-benchmarks-proto-017-PtNairob.opam +++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam @@ -15,7 +15,7 @@ depends: [ "tezos-benchmark" "tezos-benchmark-017-PtNairob" "tezos-benchmark-type-inference-017-PtNairob" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-017-PtNairob-test-helpers" "tezos-client-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" diff --git a/opam/tezos-benchmarks-proto-018-Proxford.opam b/opam/tezos-benchmarks-proto-018-Proxford.opam index 77051822a6a4..f35446ec01f9 100644 --- a/opam/tezos-benchmarks-proto-018-Proxford.opam +++ b/opam/tezos-benchmarks-proto-018-Proxford.opam @@ -15,7 +15,7 @@ depends: [ "tezos-benchmark" "tezos-benchmark-018-Proxford" "tezos-benchmark-type-inference-018-Proxford" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-018-Proxford-test-helpers" "tezos-client-018-Proxford" "tezos-protocol-plugin-018-Proxford" diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index 8426e139996b..241d5a6140f1 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -15,7 +15,7 @@ depends: [ "tezos-benchmark" "tezos-benchmark-alpha" "tezos-benchmark-type-inference-alpha" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-alpha-test-helpers" "tezos-client-alpha" "tezos-protocol-plugin-alpha" diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 971803d0843f..34478b731426 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-000-Ps9mPmXa" - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index aba7880bd13c..41c7bf242b2f 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -11,11 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-001-PtCJ7pwo" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index a74eb816f478..db796817cce8 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -11,11 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-002-PsYLVpVv" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 791066ab4b3d..ba7df41180c9 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -11,11 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-003-PsddFKi3" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 0e7e81c486e3..ec4035ab5fa0 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -11,11 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-004-Pt24m4xi" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 6045bdba4b88..5393b5e8bb1c 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -11,11 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-005-PsBabyM1" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index f322c3d8d98d..38fb76a9a590 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -11,11 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-006-PsCARTHA" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index 756f628268fe..8af67d292684 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-007-PsDELPH1" - "tezos-signer-backends" "tezos-protocol-plugin-007-PsDELPH1" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 37a649232cda..2d77716de7ef 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-008-PtEdo2Zk" - "tezos-signer-backends" "tezos-protocol-plugin-008-PtEdo2Zk" "uri" { >= "3.1.0" } - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 06781b88a5ae..04aa23d7abaf 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -12,13 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-009-PsFLoren" - "tezos-signer-backends" "tezos-protocol-plugin-009-PsFLoren" "uri" { >= "3.1.0" } - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 61bcb9a8abb0..307ff3c68518 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -12,13 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-010-PtGRANAD" - "tezos-signer-backends" "tezos-protocol-plugin-010-PtGRANAD" "uri" { >= "3.1.0" } - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index 292bd68e564c..35c312ae4645 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -12,17 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-011-PtHangz2" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-011-PtHangz2" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index d45d2fc33ddc..95f90c67b732 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -12,17 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-012-Psithaca" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-012-Psithaca" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index 59c6912fc981..31417b714fd2 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -12,17 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-013-PtJakart" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-013-PtJakart" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 922210220b2d..0f88f1d97d87 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -12,17 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-014-PtKathma" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-014-PtKathma" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index e34a3b3a6734..c2b808d14113 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -12,17 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-015-PtLimaPt" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-015-PtLimaPt" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index 010a18f5d99e..557de11fc2f3 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -12,18 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-016-PtMumbai" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-016-PtMumbai" "tezos-smart-rollup-016-PtMumbai" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index 2327afcd7386..e9f37e4e4951 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -12,18 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-017-PtNairob" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-017-PtNairob" "tezos-smart-rollup-017-PtNairob" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-018-Proxford.opam b/opam/tezos-client-018-Proxford.opam index c17f22795493..28237a25a1a6 100644 --- a/opam/tezos-client-018-Proxford.opam +++ b/opam/tezos-client-018-Proxford.opam @@ -12,18 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-018-Proxford" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-018-Proxford" "tezos-smart-rollup-018-Proxford" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 76ea94db4889..9c0cb8cf2a83 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -12,18 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-alpha" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-alpha" "tezos-smart-rollup-alpha" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam deleted file mode 100644 index 99557f41d36e..000000000000 --- a/opam/tezos-client-base-unix.opam +++ /dev/null @@ -1,32 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-client-commands" - "tezos-mockup" - "tezos-mockup-registration" - "tezos-mockup-commands" - "tezos-proxy" - "tezos-signer-backends" - "tezos-version" - "lwt-exit" - "uri" { >= "3.1.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: common helpers for `tezos-client` (unix-specific fragment)" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam deleted file mode 100644 index 18188b9110bd..000000000000 --- a/opam/tezos-client-base.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "uri" { >= "3.1.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: common helpers for `tezos-client`" diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam deleted file mode 100644 index 86d3d868cc83..000000000000 --- a/opam/tezos-client-commands.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-signer-backends" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "uri" { >= "3.1.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: protocol agnostic commands for `tezos-client`" diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam index c2733981d91e..4cc19d42483b 100644 --- a/opam/tezos-client-demo-counter.opam +++ b/opam/tezos-client-demo-counter.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-commands" + "octez-shell-libs" "tezos-protocol-demo-counter" ] build: [ diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 5f34bc3935b9..88b3f93efe7d 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -11,10 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-genesis" - "tezos-client-commands" - "tezos-proxy" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam deleted file mode 100644 index 8ba3e0a60b8d..000000000000 --- a/opam/tezos-context-ops.opam +++ /dev/null @@ -1,20 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: backend-agnostic operations on contexts" diff --git a/opam/tezos-dac-client-lib.opam b/opam/tezos-dac-client-lib.opam index 19bfae7b176e..1f80b79da052 100644 --- a/opam/tezos-dac-client-lib.opam +++ b/opam/tezos-dac-client-lib.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-dac-lib" ] build: [ diff --git a/opam/tezos-dac-lib.opam b/opam/tezos-dac-lib.opam index 9bf97a3ea184..efb7f26278f2 100644 --- a/opam/tezos-dac-lib.opam +++ b/opam/tezos-dac-lib.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-protocol-updater" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index 741c92f5aa99..12444a65064e 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-layer2-store" "tezos-dac-lib" "tezos-dac-client-lib" diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index 02ccc086761a..c2be99ccb817 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-dal-node-services" - "tezos-client-base" - "tezos-protocol-updater" - "tezos-client-base-unix" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index d56ec153d2d7..453a8e21e08f 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-000-Ps9mPmXa" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index c06db423741e..6016c3ae0882 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-001-PtCJ7pwo" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 2a6bf0ded8bf..881b1dd8267b 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-002-PsYLVpVv" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 4dbfda0ba4d7..581c51a54aa7 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-003-PsddFKi3" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index 02cb3d58953c..9be443bac03f 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-004-Pt24m4xi" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index bbc267f77182..cb1dcce66bcd 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-005-PsBABY5H" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index 6e69a417f558..2e4570512180 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-005-PsBabyM1" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index b0b70e35e607..f0cffaaf41c9 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-006-PsCARTHA" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index 7343d0f8d749..5b13bda3c2b0 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-007-PsDELPH1" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index 220da24c3c3b..5abc4efd5efa 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdo2Zk" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index a7c9871e6097..2ba391ec5c86 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdoTez" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index e215b0a26968..b6632f6f7307 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-009-PsFLoren" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index c46a44e254f9..a5e51a7758b1 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-010-PtGRANAD" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index e52733a6beac..5131411c183b 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-011-PtHangz2" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index ebdea67427ab..ba7857cab183 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-012-Psithaca" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index 5df1a4ebf7a7..570fb630c69b 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-013-PtJakart" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam index 95141cf85d3c..29f42760fe8d 100644 --- a/opam/tezos-embedded-protocol-014-PtKathma.opam +++ b/opam/tezos-embedded-protocol-014-PtKathma.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-014-PtKathma" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam index 3813e81e193e..3d1103ab73dd 100644 --- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam +++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-015-PtLimaPt" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam index 7cc9e2548853..8acc83ccca98 100644 --- a/opam/tezos-embedded-protocol-016-PtMumbai.opam +++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-016-PtMumbai" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-017-PtNairob.opam b/opam/tezos-embedded-protocol-017-PtNairob.opam index 2521c908bd8a..dc0d3013bf8b 100644 --- a/opam/tezos-embedded-protocol-017-PtNairob.opam +++ b/opam/tezos-embedded-protocol-017-PtNairob.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-017-PtNairob" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-018-Proxford.opam b/opam/tezos-embedded-protocol-018-Proxford.opam index 542db25e7f7a..256393547315 100644 --- a/opam/tezos-embedded-protocol-018-Proxford.opam +++ b/opam/tezos-embedded-protocol-018-Proxford.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-018-Proxford" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index b6192c933fee..39bd4308b422 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-alpha" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index 71b5f72c9a07..045e611ee599 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-demo-counter" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index 26b6f04e1224..68c933f06a7a 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-demo-noops" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index 94ef78323d23..1379ae7dcf19 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-genesis" - "tezos-protocol-updater" + "octez-shell-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam deleted file mode 100644 index bd1379292c6d..000000000000 --- a/opam/tezos-mockup-commands.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-commands" - "tezos-client-base" - "tezos-mockup" - "tezos-mockup-registration" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library of auto-documented RPCs (commands)" diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam deleted file mode 100644 index b2a1f730cd50..000000000000 --- a/opam/tezos-mockup-proxy.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "resto-cohttp-self-serving-client" { >= "1.2" } - "uri" { >= "3.1.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: local RPCs" diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam deleted file mode 100644 index b4af0cfd77af..000000000000 --- a/opam/tezos-mockup-registration.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "uri" { >= "3.1.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: protocol registration for the mockup mode" diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam deleted file mode 100644 index 7b927a4a6dbc..000000000000 --- a/opam/tezos-mockup.opam +++ /dev/null @@ -1,27 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-mockup-proxy" - "resto-cohttp-self-serving-client" { >= "1.2" } - "tezos-mockup-registration" - "tezt" { with-test & >= "3.1.1" } - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library of auto-documented RPCs (mockup mode)" diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 154bfa6a6029..352fe9c277ed 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -22,7 +22,7 @@ depends: [ "tezos-benchmark-type-inference-017-PtNairob" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-017-PtNairob" {with-test} - "tezos-client-base" {with-test} + "octez-shell-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 4cd03c42e437..c4211bc5bf94 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -22,7 +22,7 @@ depends: [ "tezos-benchmark-type-inference-018-Proxford" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-018-Proxford" {with-test} - "tezos-client-base" {with-test} + "octez-shell-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 4934e611e6ee..5e4f0ad98402 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -22,7 +22,7 @@ depends: [ "tezos-benchmark-type-inference-alpha" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-alpha" {with-test} - "tezos-client-base" {with-test} + "octez-shell-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam index d374767e2c24..cf70abe9cc5b 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-007-PsDELPH1" "tezos-protocol-plugin-007-PsDELPH1" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam index 4775a0140833..7affbba96c98 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-008-PtEdo2Zk" "tezos-protocol-plugin-008-PtEdo2Zk" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam index 2b6a491bbf5f..fbd31f6a2d85 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-009-PsFLoren" "tezos-protocol-plugin-009-PsFLoren" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam index 001431abcade..5926a5e7de76 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-010-PtGRANAD" "tezos-protocol-plugin-010-PtGRANAD" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam index b888133b3ded..209857bd3c92 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-011-PtHangz2" "tezos-protocol-plugin-011-PtHangz2" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam index 72598121557e..365269db3f3c 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam index 50e0b5397de1..17d7f7268266 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam index 0b931cdb21fc..164d583b89a1 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam index 1e7731c06541..d76366e9237d 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-015-PtLimaPt" "tezos-protocol-plugin-015-PtLimaPt" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam index a90ee672435c..ed31fc92d6c1 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam index fdc2d2dd02a2..3dec8b37c9c5 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam index fad1e2e08cb9..b94d56784b56 100644 --- a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam +++ b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam index 96098845109b..dcc88e2f5f24 100644 --- a/opam/tezos-protocol-plugin-alpha-registerer.opam +++ b/opam/tezos-protocol-plugin-alpha-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam deleted file mode 100644 index b92c06154cf9..000000000000 --- a/opam/tezos-protocol-updater.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "octez-protocol-compiler" - "lwt-exit" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: economic-protocol dynamic loading for `octez-node`" diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam deleted file mode 100644 index 170635151a00..000000000000 --- a/opam/tezos-proxy.opam +++ /dev/null @@ -1,30 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "aches" { >= "1.0.0" } - "aches-lwt" { >= "1.0.0" } - "octez-libs" - "tezos-client-base" - "uri" { >= "3.1.0" } - "tezos-mockup-proxy" - "tezt" { with-test & >= "3.1.1" } - "qcheck-core" {with-test} - "lwt" { with-test & >= "5.7.0" } - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: proxy" diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam deleted file mode 100644 index 80d96e5527c7..000000000000 --- a/opam/tezos-shell-benchmarks.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-benchmark" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: shell benchmarks" diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam deleted file mode 100644 index 05cbe6bd88fb..000000000000 --- a/opam/tezos-shell-context-test.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } - "octez-libs" {with-test} - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Testing the Shell Context" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam deleted file mode 100644 index ccea28e6f97f..000000000000 --- a/opam/tezos-shell.opam +++ /dev/null @@ -1,29 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_expect" - "lwt-watcher" { = "0.2" } - "lwt-canceler" { >= "0.3" & < "0.4" } - "prometheus" { >= "1.2" } - "octez-libs" - "tezos-store" - "tezos-context-ops" - "tezos-protocol-updater" - "tezos-validation" - "lwt-exit" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: core of `octez-node` (gossip, validation scheduling, mempool, ...)" diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam deleted file mode 100644 index 1fe041425324..000000000000 --- a/opam/tezos-signer-backends.opam +++ /dev/null @@ -1,33 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-signer-services" - "uri" { >= "3.1.0" } - "ocplib-endian" - "fmt" { >= "0.8.7" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -depopts: [ - "ledgerwallet-tezos" -] -conflicts: [ - "ledgerwallet-tezos" { < "0.3.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: remote-signature backends for `tezos-client`" diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam deleted file mode 100644 index 96172384dc6a..000000000000 --- a/opam/tezos-signer-services.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: descriptions of RPCs exported by `tezos-signer`" diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 850947877fbf..de0627684a7d 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -18,7 +18,7 @@ depends: [ "lwt" { >= "5.7.0" } "tezos-baking-alpha" "tezos-client-alpha" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-protocol-alpha" "tezt" { >= "3.1.1" } "uri" { >= "3.1.0" } diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam deleted file mode 100644 index 4441940d7d09..000000000000 --- a/opam/tezos-validation.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-context-ops" - "tezos-protocol-updater" - "tezos-version" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library for block validation" diff --git a/src/bin_client/dune b/src/bin_client/dune index 3f893b06ce7e..e48900d144da 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -12,13 +12,13 @@ octez-libs.tezos-clic octez-libs.tezos-rpc-http-client octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-commands - tezos-mockup-commands - tezos-proxy - tezos-client-base-unix - tezos-signer-backends.unix + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-signer-backends.unix uri (select void_for_linking-tezos-client-genesis from (tezos-client-genesis -> void_for_linking-tezos-client-genesis.empty) diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune index 9275ef12854e..c639d0ae5a56 100644 --- a/src/bin_dac_client/dune +++ b/src/bin_dac_client/dune @@ -10,9 +10,9 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib tezos-dac-lib diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index a6c73a1db976..4a1c5d7cc39c 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -10,12 +10,12 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 228c3384169c..9e4736dafb5f 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -11,12 +11,12 @@ octez-libs.tezos-base.unix octez-libs.tezos-version cmdliner - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib @@ -24,15 +24,15 @@ tezos-dal-node-services tezos_layer2_store octez-libs.tezos-crypto-dal - tezos-store.unix - tezos-store.shared + octez-shell-libs.tezos-store.unix + octez-shell-libs.tezos-store.shared octez-libs.tezos-gossipsub tezos-dal-node-lib.gossipsub octez-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-crypto octez-libs.tezos-base.p2p-identity-file - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services irmin-pack irmin-pack.unix irmin diff --git a/src/bin_node/dune b/src/bin_node/dune index 7362b2a2dfe7..d8da81456eae 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -13,19 +13,19 @@ tezos-version.value octez-node-config octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server octez-libs.tezos-p2p - tezos-shell - tezos-store - tezos-store.unix-reconstruction - tezos-store.unix-snapshots + octez-shell-libs.tezos-shell + octez-shell-libs.tezos-store + octez-shell-libs.tezos-store.unix-reconstruction + octez-shell-libs.tezos-store.unix-snapshots octez-libs.tezos-context - tezos-validation - octez-libs.tezos-shell-context + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-shell-context octez-libs.tezos-workers - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater cmdliner fmt.cli fmt.tty diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index f5e5591004cc..85018824bafa 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -14,12 +14,12 @@ cmdliner lwt-exit lwt.unix - tezos-proxy + octez-shell-libs.tezos-proxy tezos-proxy-server-config octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-rpc-http-server - octez-libs.tezos-shell-services - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-shell-context tezos-version.value uri (select void_for_linking-tezos-client-genesis from diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune index 7f97df3f6dec..30d3ccd63ccb 100644 --- a/src/bin_sequencer_node/dune +++ b/src/bin_sequencer_node/dune @@ -9,9 +9,9 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-smart-rollup-node-lib tezos-client-alpha octez_smart_rollup_node_alpha diff --git a/src/bin_signer/dune b/src/bin_signer/dune index dc4fcedf4a6b..c0d6edbd4bed 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -10,16 +10,16 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands - tezos-signer-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-signer-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - tezos-signer-backends.unix) + octez-shell-libs.tezos-signer-backends.unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune index d7a64078e6df..ac0ca1e1d564 100644 --- a/src/bin_smart_rollup_node/dune +++ b/src/bin_smart_rollup_node/dune @@ -9,10 +9,10 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-smart-rollup octez-smart-rollup-node-lib octez_smart_rollup_node_PtNairob diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 22ea8f981fdb..581bea9c2386 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -13,7 +13,7 @@ octez-libs.tezos-clic tezos-benchmark tezos-benchmark-examples - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks tezos-benchmarks-proto-alpha str pyml diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index 68b0ab7c16ad..4fc38cecf44d 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -15,7 +15,7 @@ lwt tezos-baking-alpha tezos-client-alpha.commands - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-alpha tezt octez-libs.tezt-tezos diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index d27596c92e0a..e1a17fb41ca9 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -39,7 +39,6 @@ It contains the following libraries: - {{!module-Tezos_micheline}Tezos_micheline}: Internal AST and parser for the Michelson language - {{!module-Tezos_p2p}Tezos_p2p}: Library for a pool of P2P connections - {{!module-Tezos_p2p_services}Tezos_p2p_services}: Descriptions of RPCs exported by [tezos-p2p] -- {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} - {{!module-Tezos_protocol_environment}Tezos_protocol_environment} - {{!module-Tezos_requester}Tezos_requester} - {{!module-Tezos_rpc}Tezos_rpc}: Library of auto-documented RPCs (service and hierarchy descriptions) @@ -49,8 +48,6 @@ It contains the following libraries: - {{!module-Tezos_rpc_http_server}Tezos_rpc_http_server}: Library of auto-documented RPCs (http server) - {{!module-Tezos_sapling}Tezos_sapling} - {{!module-Tezos_scoru_wasm}Tezos_scoru_wasm} -- {{!module-Tezos_shell_context}Tezos_shell_context} -- {{!module-Tezos_shell_services}Tezos_shell_services}: Descriptions of RPCs exported by [tezos-shell] - {{!module-Tezos_stdlib}Tezos_stdlib}: Yet-another local-extension of the OCaml standard library - {{!module-Tezos_stdlib_unix}Tezos_stdlib_unix}: Yet-another local-extension of the OCaml standard library (unix-specific fragment) - {{!module-Tezos_test_helpers}Tezos_test_helpers} diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index d964a15bd237..4c7dcfcbcf01 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -5,13 +5,13 @@ (library (name tezos_client_base) - (public_name tezos-client-base) + (public_name octez-shell-libs.tezos-client-base) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-clic octez-libs.tezos-rpc - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-sapling uri) (js_of_ocaml) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index 99f252c12536..be18f3e45848 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -9,7 +9,7 @@ (libraries tezt.core octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) @@ -35,7 +35,7 @@ (rule (alias runtest) - (package tezos-client-base) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -58,7 +58,7 @@ (rule (alias runtest_js) - (package tezos-client-base) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 5ee4d3e82734..d37875efed3e 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -3,7 +3,7 @@ (library (name tezos_client_base_unix) - (public_name tezos-client-base-unix) + (public_name octez-shell-libs.tezos-client-base-unix) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base @@ -12,16 +12,16 @@ octez-libs.tezos-rpc octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-commands - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-proxy - tezos-proxy.rpc - tezos-signer-backends.unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-proxy.rpc + octez-shell-libs.tezos-signer-backends.unix tezos-version.value lwt-exit uri) diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index 04c4615db990..595675a5fa70 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -7,8 +7,8 @@ (libraries tezt.core octez-libs.tezos-base - tezos-mockup-commands - tezos-client-base-unix + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) @@ -34,7 +34,7 @@ (rule (alias runtest) - (package tezos-client-base-unix) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 27d7540500b5..033cc8876332 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -3,19 +3,19 @@ (library (name tezos_client_commands) - (public_name tezos-client-commands) + (public_name octez-shell-libs.tezos-client-commands) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-rpc octez-libs.tezos-clic octez-libs.tezos-clic.unix - tezos-client-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-shell-services octez-libs.tezos-p2p-services octez-libs.tezos-stdlib-unix octez-libs.tezos-base.unix - tezos-signer-backends + octez-shell-libs.tezos-signer-backends data-encoding uri) (library_flags (:standard -linkall)) diff --git a/src/lib_crawler/dune b/src/lib_crawler/dune index 0dd9be76bfc6..45869f72a58e 100644 --- a/src/lib_crawler/dune +++ b/src/lib_crawler/dune @@ -10,8 +10,8 @@ octez-libs.tezos-rpc-http octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-shell) + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-shell) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dac/dune b/src/lib_dac/dune index 89e8ef887e9c..aa0e0420a24b 100644 --- a/src/lib_dac/dune +++ b/src/lib_dac/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-updater) + octez-shell-libs.tezos-protocol-updater) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dac_client/dune b/src/lib_dac_client/dune index c11e7e4afc31..54a8e4cf98c4 100644 --- a/src/lib_dac_client/dune +++ b/src/lib_dac_client/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix tezos-dac-lib) (flags diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index 35783161984d..8a41ca3a4690 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix tezos_layer2_store octez-libs.tezos-rpc-http-server diff --git a/src/lib_dal_node/dune b/src/lib_dal_node/dune index 2dc6dfd68ba3..70d1da5d457d 100644 --- a/src/lib_dal_node/dune +++ b/src/lib_dal_node/dune @@ -9,9 +9,9 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-dal-node-services - tezos-client-base - tezos-protocol-updater - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-protocol-updater + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto-dal octez-libs.tezos-p2p diff --git a/src/lib_injector/dune b/src/lib_injector/dune index 0f6ae1186538..e14b4b413c22 100644 --- a/src/lib_injector/dune +++ b/src/lib_injector/dune @@ -12,9 +12,9 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto octez-libs.tezos-micheline - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-workers - tezos-shell + octez-shell-libs.tezos-shell octez-crawler) (flags (:standard) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 574895b06218..8076b62f4c21 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -3,12 +3,12 @@ (library (name tezos_mockup_registration) - (public_name tezos-mockup-registration) + (public_name octez-shell-libs.tezos-mockup-registration) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-client-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-shell-services octez-libs.tezos-protocol-environment uri) (flags @@ -18,13 +18,13 @@ (library (name tezos_mockup) - (public_name tezos-mockup) + (public_name octez-shell-libs.tezos-mockup) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-mockup-proxy + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-mockup-proxy resto-cohttp-self-serving-client octez-libs.tezos-rpc octez-libs.tezos-p2p-services @@ -33,7 +33,7 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client - tezos-mockup-registration) + octez-shell-libs.tezos-mockup-registration) (flags (:standard) -open Tezos_base.TzPervasives @@ -48,15 +48,15 @@ (library (name tezos_mockup_commands) - (public_name tezos-mockup-commands) + (public_name octez-shell-libs.tezos-mockup-commands) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-clic - tezos-client-commands - tezos-client-base - tezos-mockup - tezos-mockup-registration) + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 035f619d987c..8067b599118b 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -10,9 +10,9 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers octez-libs.tezos-rpc - tezos-mockup - tezos-mockup-registration - tezos-client-base + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-client-base qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -39,7 +39,7 @@ (rule (alias runtest) - (package tezos-mockup) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index 0e7edc83a55d..83cd2776d8de 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -3,16 +3,16 @@ (library (name tezos_mockup_proxy) - (public_name tezos-mockup-proxy) + (public_name octez-shell-libs.tezos-mockup-proxy) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-protocol-environment octez-libs.tezos-rpc-http resto-cohttp-self-serving-client octez-libs.tezos-rpc-http-client - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services uri) (flags (:standard) diff --git a/src/lib_node_config/dune b/src/lib_node_config/dune index f4a45cc67443..a3053d9f41b6 100644 --- a/src/lib_node_config/dune +++ b/src/lib_node_config/dune @@ -9,12 +9,12 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server octez-libs.tezos-context - tezos-store - tezos-validation) + octez-shell-libs.tezos-store + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_p2p/test/common/dune b/src/lib_p2p/test/common/dune index bc365c0e15aa..75c112ecefe1 100644 --- a/src/lib_p2p/test/common/dune +++ b/src/lib_p2p/test/common/dune @@ -3,7 +3,7 @@ (library (name tezos_p2p_test_common) - (public_name octez-libs.tezos_p2p_test_common) + (public_name octez-shell-libs.tezos_p2p_test_common) (instrumentation (backend bisect_ppx)) (libraries tezt diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index d014e44232af..e178b08cb94c 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -23,7 +23,7 @@ octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers - octez-libs.tezos_p2p_test_common + octez-shell-libs.tezos_p2p_test_common octez-libs.tezos-p2p-services octez-libs.tezt-tezos tezt @@ -44,60 +44,60 @@ (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_socket.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_pool.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_broadcast.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_io_scheduler.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_peerset.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_buffer_reader.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_banned_peers.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_node.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_connect_handler.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_maintenance.exe}))) diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index 2b213b45aeb0..b0d8579f8d43 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -15,7 +15,7 @@ octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers - octez-libs.tezos_p2p_test_common) + octez-shell-libs.tezos_p2p_test_common) (library_flags (:standard -linkall)) (flags (:standard) @@ -42,7 +42,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune index b7f00cab6f67..f3e640ddb4bf 100644 --- a/src/lib_protocol_environment/context_ops/dune +++ b/src/lib_protocol_environment/context_ops/dune @@ -3,14 +3,14 @@ (library (name tezos_context_ops) - (public_name tezos-context-ops) + (public_name octez-shell-libs.tezos-context-ops) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-error-monad octez-libs.tezos-protocol-environment octez-libs.tezos-context - octez-libs.tezos-shell-context) + octez-shell-libs.tezos-shell-context) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune index ba925990c5c0..c4192c0d5862 100644 --- a/src/lib_protocol_environment/shell_context/dune +++ b/src/lib_protocol_environment/shell_context/dune @@ -3,7 +3,7 @@ (library (name tezos_shell_context) - (public_name octez-libs.tezos-shell-context) + (public_name octez-shell-libs.tezos-shell-context) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index 8919447d3d24..e72e58104b38 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-alcotezt octez-libs.tezos-test-helpers octez-libs.tezos-base @@ -32,7 +32,7 @@ (rule (alias runtest) - (package tezos-shell-context-test) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index d002816146cb..633f9972534a 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -3,15 +3,15 @@ (library (name tezos_protocol_updater) - (public_name tezos-protocol-updater) + (public_name octez-shell-libs.tezos-protocol-updater) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-protocol-compiler.registerer octez-protocol-compiler.native octez-libs.tezos-context diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index 462c3561d185..50a47c775ce4 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -3,17 +3,17 @@ (library (name tezos_proxy) - (public_name tezos-proxy) + (public_name octez-shell-libs.tezos-proxy) (instrumentation (backend bisect_ppx)) (libraries aches aches-lwt octez-libs.tezos-base octez-libs.tezos-clic - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-protocol-environment octez-libs.tezos-rpc - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-context.memory uri) (flags diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune index 7986c10b310b..9a051751aafb 100644 --- a/src/lib_proxy/rpc/dune +++ b/src/lib_proxy/rpc/dune @@ -3,14 +3,14 @@ (library (name tezos_proxy_rpc) - (public_name tezos-proxy.rpc) + (public_name octez-shell-libs.tezos-proxy.rpc) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-client-base - tezos-mockup-proxy + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-mockup-proxy octez-libs.tezos-rpc - tezos-proxy + octez-shell-libs.tezos-proxy uri) (flags (:standard) diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index d4195dfb75af..0f090eb2801e 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - tezos-proxy + octez-shell-libs.tezos-proxy octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers tezos_proxy_test_helpers_shell_services @@ -45,7 +45,7 @@ (rule (alias runtest) - (package tezos-proxy) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_proxy/test_helpers/shell_services/dune b/src/lib_proxy/test_helpers/shell_services/dune index 3f93620fe9a8..5dd9dd4ad4d0 100644 --- a/src/lib_proxy/test_helpers/shell_services/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -5,7 +5,7 @@ (name tezos_proxy_test_helpers_shell_services) (libraries octez-libs.tezos-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-test-helpers qcheck-core octez-libs.tezos-context.memory diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index ebdbaf9bfbf8..6e8819bbdd0b 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-test-helpers - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services tezos_proxy_test_helpers_shell_services qcheck-alcotest octez-alcotezt) @@ -33,7 +33,7 @@ (rule (alias runtest) - (package tezos-proxy) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune index 05bbffc8a56c..ebf1f3e24175 100644 --- a/src/lib_scoru_sequencer/dune +++ b/src/lib_scoru_sequencer/dune @@ -13,7 +13,7 @@ octez-libs.tezos-workers octez-smart-rollup-node-lib octez-smart-rollup - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-rpc octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server) diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 0fdfb9e17a83..d432ec58a728 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -3,7 +3,7 @@ (library (name tezos_shell) - (public_name tezos-shell) + (public_name octez-shell-libs.tezos-shell) (instrumentation (backend bisect_ppx)) (libraries lwt-watcher @@ -13,19 +13,19 @@ octez-libs.tezos-base.unix octez-libs.tezos-rpc octez-libs.tezos-context - tezos-store - tezos-store.shared + octez-shell-libs.tezos-store + octez-shell-libs.tezos-store.shared octez-libs.tezos-protocol-environment - tezos-context-ops - octez-libs.tezos-shell-context + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context octez-libs.tezos-p2p octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-p2p-services - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-requester octez-libs.tezos-workers - tezos-validation + octez-shell-libs.tezos-validation octez-libs.tezos-version octez-libs.tezos-crypto-dal.octez-dal-config lwt-exit) @@ -53,4 +53,4 @@ -open Tezos_version -open Tezos_crypto_dal_octez_dal_config)) -(documentation (package tezos-shell) (mld_files octez_shell)) +(documentation (package octez-shell-libs) (mld_files octez_shell)) diff --git a/src/lib_shell/index.mld b/src/lib_shell/index.mld index d251a906a1dd..354449603879 100644 --- a/src/lib_shell/index.mld +++ b/src/lib_shell/index.mld @@ -4,3 +4,23 @@ This is a package containing some libraries used by the shell of Octez. It contains the following libraries: +- {{!module-Mocked}Mocked} +- {{!module-Tezos_client_base}Tezos_client_base}: Tezos: common helpers for `tezos-client` +- {{!module-Tezos_client_base_unix}Tezos_client_base_unix}: Tezos: common helpers for `tezos-client` (unix-specific fragment) +- {{!module-Tezos_client_commands}Tezos_client_commands}: Tezos: protocol agnostic commands for `tezos-client` +- {{!module-Tezos_context_ops}Tezos_context_ops}: Backend-agnostic operations on contexts +- {{!module-Tezos_mockup}Tezos_mockup}: Tezos: library of auto-documented RPCs (mockup mode) +- {{!module-Tezos_mockup_commands}Tezos_mockup_commands}: Tezos: library of auto-documented RPCs (commands) +- {{!module-Tezos_mockup_proxy}Tezos_mockup_proxy}: Tezos: local RPCs +- {{!module-Tezos_mockup_registration}Tezos_mockup_registration}: Tezos: protocol registration for the mockup mode +- {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} +- {{!module-Tezos_protocol_updater}Tezos_protocol_updater}: Economic-protocol dynamic loading for `octez-node` +- {{!module-Tezos_proxy}Tezos_proxy}: Tezos: proxy +- {{!page-tezos_shell}Tezos_shell}: Core of `octez-node` (gossip, validation scheduling, mempool, ...) +- {{!module-Tezos_shell_benchmarks}Tezos_shell_benchmarks}: Tezos: shell benchmarks +- {{!module-Tezos_shell_context}Tezos_shell_context} +- {{!module-Tezos_shell_services}Tezos_shell_services}: Descriptions of RPCs exported by [tezos-shell] +- {{!module-Tezos_signer_backends}Tezos_signer_backends}: Tezos: remote-signature backends for `tezos-client` +- {{!module-Tezos_signer_services}Tezos_signer_services}: Tezos: descriptions of RPCs exported by `tezos-signer` +- {{!module-Tezos_store}Tezos_store}: Store for `octez-node` +- {{!module-Tezos_validation}Tezos_validation}: Library for block validation diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 20b1bd20df68..f25533c44f73 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -8,20 +8,20 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base-test-helpers - tezos-store - tezos-store.shared + octez-shell-libs.tezos-store + octez-shell-libs.tezos-store.shared octez-libs.tezos-context - tezos-context-ops - octez-libs.tezos-shell-context - tezos-protocol-updater + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-requester - tezos-shell - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell + octez-shell-libs.tezos-shell-services tezos-embedded-protocol-demo-noops octez-libs.tezos-stdlib-unix - tezos-validation + octez-shell-libs.tezos-validation octez-libs.tezos-event-logging-test-helpers octez-libs.tezos-test-helpers octez-alcotezt diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune index 524223a052af..990ee0ebff58 100644 --- a/src/lib_shell_benchmarks/dune +++ b/src/lib_shell_benchmarks/dune @@ -3,7 +3,7 @@ (library (name tezos_shell_benchmarks) - (public_name tezos-shell-benchmarks) + (public_name octez-shell-libs.tezos-shell-benchmarks) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib @@ -12,7 +12,7 @@ tezos-benchmark octez-libs.tezos-crypto octez-libs.tezos-context - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune index bba5e5ae85cf..d00851735e00 100644 --- a/src/lib_shell_services/dune +++ b/src/lib_shell_services/dune @@ -5,7 +5,7 @@ (library (name tezos_shell_services) - (public_name octez-libs.tezos-shell-services) + (public_name octez-shell-libs.tezos-shell-services) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index bc60905d5fe9..fe1c40853a6c 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -9,7 +9,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) @@ -33,7 +33,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -53,7 +53,7 @@ (rule (alias runtest_js) - (package octez-libs) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune index 25cdd0945380..7d2afc3468d4 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -3,16 +3,16 @@ (library (name tezos_signer_backends) - (public_name tezos-signer-backends) + (public_name octez-shell-libs.tezos-signer-backends) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client - tezos-signer-services - octez-libs.tezos-shell-services + octez-shell-libs.tezos-signer-services + octez-shell-libs.tezos-shell-services uri) (flags (:standard) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index b661922ff448..e3ccc3ae006c 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -11,8 +11,8 @@ octez-libs.tezos-stdlib octez-libs.tezos-error-monad octez-libs.tezos-crypto - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends octez-alcotezt uri) (library_flags (:standard -linkall)) @@ -41,7 +41,7 @@ (rule (alias runtest) - (package tezos-signer-backends) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 2b6076289144..22f062164962 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -3,7 +3,7 @@ (library (name tezos_signer_backends_unix) - (public_name tezos-signer-backends.unix) + (public_name octez-shell-libs.tezos-signer-backends.unix) (instrumentation (backend bisect_ppx)) (libraries ocplib-endian.bigstring @@ -13,13 +13,13 @@ octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client octez-libs.tezos-rpc-http-client-unix - tezos-signer-services - tezos-signer-backends - octez-libs.tezos-shell-services + octez-shell-libs.tezos-signer-services + octez-shell-libs.tezos-signer-backends + octez-shell-libs.tezos-shell-services uri (select ledger.ml from (ledgerwallet-tezos -> ledger.available.ml) diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 9aa37139e8aa..0912b2c762a0 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -9,8 +9,8 @@ octez-libs.tezos-error-monad octez-libs.tezos-stdlib octez-libs.tezos-crypto - tezos-client-base - tezos-signer-backends.unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends.unix octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -37,7 +37,7 @@ (rule (alias runtest) - (package tezos-signer-backends) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index b34a5985a2f8..90026f18e1e0 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -5,12 +5,12 @@ (library (name tezos_signer_services) - (public_name tezos-signer-services) + (public_name octez-shell-libs.tezos-signer-services) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-rpc - tezos-client-base) + octez-shell-libs.tezos-client-base) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune index d6cdfc245885..dbdf90212858 100644 --- a/src/lib_smart_rollup_node/dune +++ b/src/lib_smart_rollup_node/dune @@ -10,8 +10,8 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix cohttp-lwt-unix octez-node-config prometheus-app diff --git a/src/lib_store/dune b/src/lib_store/dune index 741611718ad7..729bcf9c2ec4 100644 --- a/src/lib_store/dune +++ b/src/lib_store/dune @@ -3,17 +3,17 @@ (library (name tezos_store) - (public_name tezos-store) + (public_name octez-shell-libs.tezos-store) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-crypto octez-libs.tezos-rpc lwt-watcher - octez-libs.tezos-shell-services - tezos-validation - tezos-context-ops - tezos-store.shared) + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-store.shared) (flags (:standard) -open Tezos_base @@ -24,4 +24,4 @@ -open Tezos_context_ops -open Tezos_store_shared) (virtual_modules store) - (default_implementation tezos-store.real)) + (default_implementation octez-shell-libs.tezos-store.real)) diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune index 981b60cd14aa..e674425ec6a5 100644 --- a/src/lib_store/mocked/dune +++ b/src/lib_store/mocked/dune @@ -2,19 +2,19 @@ ; Edit file manifest/main.ml instead. (library - (name tezos_store_mocked) - (public_name tezos-store.mocked) - (implements tezos-store) + (name mocked) + (public_name octez-shell-libs.mocked) + (implements octez-shell-libs.tezos-store) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-crypto - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-context.memory - tezos-context-ops - tezos-validation + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-validation octez-libs.tezos-protocol-environment - tezos-store.shared) + octez-shell-libs.tezos-store.shared) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_store/real/dune b/src/lib_store/real/dune index dde874c6d5ad..5de4ed3741f8 100644 --- a/src/lib_store/real/dune +++ b/src/lib_store/real/dune @@ -3,11 +3,11 @@ (library (name tezos_store_real) - (public_name tezos-store.real) - (implements tezos-store) + (public_name octez-shell-libs.tezos-store.real) + (implements octez-shell-libs.tezos-store) (instrumentation (backend bisect_ppx)) (libraries - tezos-store.unix) + octez-shell-libs.tezos-store.unix) (flags (:standard) -open Tezos_store_unix)) diff --git a/src/lib_store/shared/dune b/src/lib_store/shared/dune index b60a3584631e..7144a73ec8f9 100644 --- a/src/lib_store/shared/dune +++ b/src/lib_store/shared/dune @@ -3,16 +3,16 @@ (library (name tezos_store_shared) - (public_name tezos-store.shared) + (public_name octez-shell-libs.tezos-store.shared) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-crypto - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services aches aches-lwt - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_stdlib_unix diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune index 3e13c03bb442..03b48efccfc3 100644 --- a/src/lib_store/unix/dune +++ b/src/lib_store/unix/dune @@ -3,21 +3,21 @@ (library (name tezos_store_unix) - (public_name tezos-store.unix) + (public_name octez-shell-libs.tezos-store.unix) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-base octez-libs.tezos-version index irmin-pack - tezos-store.shared + octez-shell-libs.tezos-store.shared octez-libs.tezos-protocol-environment octez-libs.tezos-context - tezos-context-ops - octez-libs.tezos-shell-context - tezos-validation - tezos-protocol-updater + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib octez-libs.tezos-crypto @@ -55,18 +55,18 @@ (library (name tezos_store_unix_reconstruction) - (public_name tezos-store.unix-reconstruction) + (public_name octez-shell-libs.tezos-store.unix-reconstruction) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto - octez-libs.tezos-shell-services - tezos-protocol-updater - tezos-validation - tezos-context-ops - tezos-store.shared - tezos-store.unix) + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-protocol-updater + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-store.shared + octez-shell-libs.tezos-store.unix) (flags (:standard) -open Tezos_base @@ -83,17 +83,17 @@ (library (name tezos_store_unix_snapshots) - (public_name tezos-store.unix-snapshots) + (public_name octez-shell-libs.tezos-store.unix-snapshots) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-context - tezos-validation - tezos-store.shared - tezos-store.unix) + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-store.shared + octez-shell-libs.tezos-store.unix) (flags (:standard) -open Tezos_base diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 482591531f53..d26b95f3cebf 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -8,15 +8,15 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-crypto - tezos-context-ops - tezos-store.shared - tezos-store.unix - tezos-store.unix-reconstruction - tezos-store.unix-snapshots - octez-libs.tezos-shell-services + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-store.shared + octez-shell-libs.tezos-store.unix + octez-shell-libs.tezos-store.unix-reconstruction + octez-shell-libs.tezos-store.unix-snapshots + octez-shell-libs.tezos-shell-services octez-libs.tezos-stdlib-unix - tezos-validation - tezos-protocol-updater + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-protocol-updater tezos-embedded-protocol-demo-noops tezos-embedded-protocol-genesis tezos-embedded-protocol-alpha diff --git a/src/lib_validation/dune b/src/lib_validation/dune index 9529f8c126d1..0b60c0d47cee 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -3,7 +3,7 @@ (library (name tezos_validation) - (public_name tezos-validation) + (public_name octez-shell-libs.tezos-validation) (instrumentation (backend bisect_ppx)) (instrumentation (backend tezos-time-measurement)) (libraries @@ -11,10 +11,10 @@ octez-libs.tezos-crypto octez-libs.tezos-rpc octez-libs.tezos-context - tezos-context-ops - octez-libs.tezos-shell-context - octez-libs.tezos-shell-services - tezos-protocol-updater + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-stdlib-unix tezos-version.value) (flags diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index bc0a67623317..be0c20aef472 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -7,12 +7,12 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-000-Ps9mPmXa tezos-protocol-000-Ps9mPmXa.lifted octez-libs.tezos-rpc - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib-unix) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index d240d149718b..f70d0a1b24f1 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -130,7 +130,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-000-Ps9mPmXa - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index 44001073f802..353880e954b0 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-001-PtCJ7pwo tezos-protocol-001-PtCJ7pwo.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index 83c84f67ac65..ba8fe49c3151 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-001-PtCJ7pwo octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-001-PtCJ7pwo - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-001-PtCJ7pwo - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-001-PtCJ7pwo.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index c7349d43bdd9..87c587a9a0b5 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -328,7 +328,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-001-PtCJ7pwo - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index 5bb388a99788..c8b9213a9c54 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-002-PsYLVpVv tezos-protocol-002-PsYLVpVv.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index 626aca5e9626..e88251614fa6 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-002-PsYLVpVv octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-002-PsYLVpVv - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-002-PsYLVpVv - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-002-PsYLVpVv.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 884659f9ccca..0779df23f73d 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -328,7 +328,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-002-PsYLVpVv - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index 17bf5c1f3e6d..a033c9bf4ff8 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-003-PsddFKi3 tezos-protocol-003-PsddFKi3.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index 6de75bef8be3..77c5b0790d9b 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-003-PsddFKi3 octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-003-PsddFKi3 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-003-PsddFKi3 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-003-PsddFKi3.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 2e2c054deaa6..b39496be313e 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -331,7 +331,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-003-PsddFKi3 - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index 3ba8deac3828..9a280b70b341 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-004-Pt24m4xi tezos-protocol-004-Pt24m4xi.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index 19fd467ee9a7..ef6eac1f3e8f 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-004-Pt24m4xi octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-004-Pt24m4xi - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-004-Pt24m4xi - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-004-Pt24m4xi.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 9d337fc95162..232d270fa084 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -331,7 +331,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-004-Pt24m4xi - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index fc9ccc6c8247..bd126823f9d6 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -334,7 +334,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-005-PsBABY5H - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 27052582ebb5..f2b73ef96af8 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-005-PsBabyM1 tezos-protocol-005-PsBabyM1.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index 982bb97c4ba4..00768b6134df 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-005-PsBabyM1 octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-005-PsBabyM1 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-005-PsBabyM1 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-005-PsBabyM1.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 9949d43268c5..b940c73d7db9 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -334,7 +334,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-005-PsBabyM1 - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index 148ca144f8ce..c563f00cf8c5 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-006-PsCARTHA tezos-protocol-006-PsCARTHA.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index a338d91dbe20..9f8c7c4e2041 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-006-PsCARTHA octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-006-PsCARTHA - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-006-PsCARTHA octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-006-PsCARTHA - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-006-PsCARTHA.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index de31f0e42203..15add6ad00ba 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -334,7 +334,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-006-PsCARTHA - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 53640f94a0d4..2657f1a7b1cb 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-007-PsDELPH1 tezos-protocol-007-PsDELPH1.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-007-PsDELPH1 octez-libs.tezos-rpc uri) diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 40a5e44a83b8..322f065eb1da 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -10,10 +10,10 @@ tezos-protocol-007-PsDELPH1 octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-007-PsDELPH1 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -36,10 +36,10 @@ octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-007-PsDELPH1 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-007-PsDELPH1.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune index 477234d34909..bf631d9ebf18 100644 --- a/src/proto_007_PsDELPH1/lib_plugin/dune +++ b/src/proto_007_PsDELPH1/lib_plugin/dune @@ -21,7 +21,7 @@ octez-libs.tezos-base tezos-embedded-protocol-007-PsDELPH1 tezos-protocol-plugin-007-PsDELPH1 - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index b2354d30517b..e69068437c19 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -340,7 +340,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-007-PsDELPH1 - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index fda20498ca32..76185dc16ab0 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-008-PtEdo2Zk tezos-protocol-008-PtEdo2Zk.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-008-PtEdo2Zk octez-libs.tezos-rpc uri) diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 086d6d8e8269..0772c8b266ff 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -11,10 +11,10 @@ tezos-protocol-008-PtEdo2Zk octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-008-PtEdo2Zk - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc tezos-protocol-plugin-008-PtEdo2Zk) (library_flags (:standard -linkall)) @@ -40,10 +40,10 @@ octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-008-PtEdo2Zk - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-008-PtEdo2Zk.commands octez-libs.tezos-rpc tezos-protocol-plugin-008-PtEdo2Zk) diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune index f32a14543b8f..ad6285a26c97 100644 --- a/src/proto_008_PtEdo2Zk/lib_plugin/dune +++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-008-PtEdo2Zk tezos-protocol-plugin-008-PtEdo2Zk - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 5d98a0f74e74..323376c0160d 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -355,7 +355,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-008-PtEdo2Zk - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 9be240cc648b..230f809000f2 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -355,7 +355,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-008-PtEdoTez - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index 055d1f51644f..8a500d0171a5 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-009-PsFLoren tezos-protocol-009-PsFLoren.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-009-PsFLoren octez-libs.tezos-rpc uri) diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index 90a96786bb92..068e48fc8540 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -11,12 +11,12 @@ tezos-protocol-009-PsFLoren octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-009-PsFLoren - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-009-PsFLoren) (library_flags (:standard -linkall)) (flags @@ -42,10 +42,10 @@ octez-libs.tezos-clic tezos-protocol-009-PsFLoren octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-009-PsFLoren - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-009-PsFLoren.commands octez-libs.tezos-rpc tezos-protocol-plugin-009-PsFLoren) diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune index 373a752853e0..17f37f0dd2d3 100644 --- a/src/proto_009_PsFLoren/lib_plugin/dune +++ b/src/proto_009_PsFLoren/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-009-PsFLoren tezos-protocol-plugin-009-PsFLoren - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index ac16d840cc4b..99a329421c77 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -364,7 +364,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-009-PsFLoren - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 9b3424ba64ba..13c8d2834060 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-010-PtGRANAD tezos-protocol-010-PtGRANAD.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-010-PtGRANAD octez-libs.tezos-rpc uri) diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index a71ce8782531..023bf2ebb681 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -11,12 +11,12 @@ tezos-protocol-010-PtGRANAD octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-010-PtGRANAD - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-010-PtGRANAD) (library_flags (:standard -linkall)) (flags @@ -42,10 +42,10 @@ octez-libs.tezos-clic tezos-protocol-010-PtGRANAD octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-010-PtGRANAD - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-010-PtGRANAD.commands octez-libs.tezos-rpc tezos-protocol-plugin-010-PtGRANAD) diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune index c8e0e4642a73..55ebf7dfdece 100644 --- a/src/proto_010_PtGRANAD/lib_plugin/dune +++ b/src/proto_010_PtGRANAD/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-010-PtGRANAD tezos-protocol-plugin-010-PtGRANAD - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index b49429beedeb..fd9c6cd8894d 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -379,7 +379,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-010-PtGRANAD - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 80c6a9f1c702..e34ba63a965f 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-011-PtHangz2 tezos-protocol-011-PtHangz2.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-011-PtHangz2 tezos-protocol-011-PtHangz2.parameters octez-libs.tezos-rpc diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index 867dda9208d2..3971c3f43951 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -11,15 +11,15 @@ tezos-protocol-011-PtHangz2 octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-011-PtHangz2 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-011-PtHangz2 uri) (library_flags (:standard -linkall)) @@ -46,10 +46,10 @@ octez-libs.tezos-clic tezos-protocol-011-PtHangz2 octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-011-PtHangz2 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-011-PtHangz2.commands tezos-client-011-PtHangz2.sapling octez-libs.tezos-rpc diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index b3c22a573185..3d512e487c29 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-011-PtHangz2 tezos-client-011-PtHangz2.commands tezos-protocol-011-PtHangz2) diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune index 8de656990851..624996ff19ec 100644 --- a/src/proto_011_PtHangz2/lib_plugin/dune +++ b/src/proto_011_PtHangz2/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-011-PtHangz2 tezos-protocol-plugin-011-PtHangz2 - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index afcf1fdb3f9c..28cc1fc357b1 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -413,7 +413,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-011-PtHangz2 - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index b29571bf7379..e59ab264156b 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-012-Psithaca tezos-protocol-012-Psithaca.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-012-Psithaca tezos-protocol-012-Psithaca.parameters octez-libs.tezos-rpc diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index 673b26000086..5d4631b7c632 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -11,15 +11,15 @@ tezos-protocol-012-Psithaca octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-012-Psithaca - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-012-Psithaca uri) (library_flags (:standard -linkall)) @@ -46,10 +46,10 @@ octez-libs.tezos-clic tezos-protocol-012-Psithaca octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-012-Psithaca - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-012-Psithaca.commands tezos-client-012-Psithaca.sapling octez-libs.tezos-rpc diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index d21e2fd5ce46..b14b7b9e826d 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-012-Psithaca tezos-client-012-Psithaca.commands tezos-protocol-012-Psithaca) diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune index 7b73afdc894a..eefb000a8816 100644 --- a/src/proto_012_Psithaca/lib_plugin/dune +++ b/src/proto_012_Psithaca/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-012-Psithaca tezos-protocol-plugin-012-Psithaca - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index dbb97194aed6..9bea71d80fe8 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -464,7 +464,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-012-Psithaca - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 85cd4d450d18..fe4d3b099324 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-013-PtJakart tezos-protocol-013-PtJakart.parameters octez-libs.tezos-rpc diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index e04869f95886..3be22aeddb0f 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-013-PtJakart.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-013-PtJakart - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-013-PtJakart uri) (library_flags (:standard -linkall)) @@ -49,10 +49,10 @@ tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-013-PtJakart - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-013-PtJakart.commands tezos-client-013-PtJakart.sapling octez-libs.tezos-rpc diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index d62537b04049..be94eede52c4 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-013-PtJakart tezos-client-013-PtJakart.commands tezos-protocol-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune index 551c150ebd63..2d9e07267e67 100644 --- a/src/proto_013_PtJakart/lib_plugin/dune +++ b/src/proto_013_PtJakart/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index a8ed057f1bb6..ccb11bef50d8 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -661,7 +661,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-013-PtJakart - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index a27221fb0e50..f1b4fad218d9 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-014-PtKathma tezos-protocol-014-PtKathma.parameters octez-libs.tezos-rpc diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index 61e539f20c7c..63a85c27f2a7 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-014-PtKathma.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-014-PtKathma - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-014-PtKathma uri) (library_flags (:standard -linkall)) @@ -49,10 +49,10 @@ tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-014-PtKathma - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-014-PtKathma.commands tezos-client-014-PtKathma.sapling octez-libs.tezos-rpc diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index 84700fa1ae4f..89b90b0bd77a 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-014-PtKathma tezos-client-014-PtKathma.commands tezos-protocol-014-PtKathma diff --git a/src/proto_014_PtKathma/lib_plugin/dune b/src/proto_014_PtKathma/lib_plugin/dune index 62ff69e491ad..fbeb8bc8aa15 100644 --- a/src/proto_014_PtKathma/lib_plugin/dune +++ b/src/proto_014_PtKathma/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-014-PtKathma tezos-protocol-plugin-014-PtKathma - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune index 596711949d6f..15838f551c9c 100644 --- a/src/proto_014_PtKathma/lib_protocol/dune +++ b/src/proto_014_PtKathma/lib_protocol/dune @@ -731,7 +731,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-014-PtKathma - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index ad2ca11d6ace..2338222d504c 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-rpc diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune index bbc97162cc67..7cc2281cd121 100644 --- a/src/proto_015_PtLimaPt/lib_client_commands/dune +++ b/src/proto_015_PtLimaPt/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-015-PtLimaPt - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-015-PtLimaPt uri) (library_flags (:standard -linkall)) @@ -48,10 +48,10 @@ tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-015-PtLimaPt - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-015-PtLimaPt.commands tezos-client-015-PtLimaPt.sapling octez-libs.tezos-rpc diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune index cf26b963080e..c831e8a55974 100644 --- a/src/proto_015_PtLimaPt/lib_client_sapling/dune +++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-015-PtLimaPt tezos-client-015-PtLimaPt.commands tezos-protocol-015-PtLimaPt diff --git a/src/proto_015_PtLimaPt/lib_plugin/dune b/src/proto_015_PtLimaPt/lib_plugin/dune index b0b9b2e47e21..a37e67e963fd 100644 --- a/src/proto_015_PtLimaPt/lib_plugin/dune +++ b/src/proto_015_PtLimaPt/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-015-PtLimaPt tezos-protocol-plugin-015-PtLimaPt - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/dune b/src/proto_015_PtLimaPt/lib_protocol/dune index 2864672c198d..890cddd71e5c 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/dune @@ -805,7 +805,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-015-PtLimaPt - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index 95671d31e05f..2f0f1b0bc06e 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-016-PtMumbai tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-rpc diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune index 6a4d5e8089c3..8f60d08d8c4d 100644 --- a/src/proto_016_PtMumbai/lib_client_commands/dune +++ b/src/proto_016_PtMumbai/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-016-PtMumbai - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-016-PtMumbai uri) (library_flags (:standard -linkall)) @@ -48,10 +48,10 @@ tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-016-PtMumbai - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-016-PtMumbai.commands tezos-client-016-PtMumbai.sapling octez-libs.tezos-rpc diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune index acbe8d47a02d..214228ce4ba4 100644 --- a/src/proto_016_PtMumbai/lib_client_sapling/dune +++ b/src/proto_016_PtMumbai/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-016-PtMumbai tezos-client-016-PtMumbai.commands tezos-protocol-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_plugin/dune b/src/proto_016_PtMumbai/lib_plugin/dune index dfa6e7a37a08..811909d227fd 100644 --- a/src/proto_016_PtMumbai/lib_plugin/dune +++ b/src/proto_016_PtMumbai/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-016-PtMumbai tezos-protocol-plugin-016-PtMumbai - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/dune b/src/proto_016_PtMumbai/lib_protocol/dune index 279fb749c9d6..30b579c95da8 100644 --- a/src/proto_016_PtMumbai/lib_protocol/dune +++ b/src/proto_016_PtMumbai/lib_protocol/dune @@ -857,7 +857,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-016-PtMumbai - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune index 81bfdb52f337..e8607a44ed9c 100644 --- a/src/proto_017_PtNairob/bin_accuser/dune +++ b/src/proto_017_PtNairob/bin_accuser/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune index 028186ff7290..226c71e21170 100644 --- a/src/proto_017_PtNairob/bin_baker/dune +++ b/src/proto_017_PtNairob/bin_baker/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_017_PtNairob/bin_sc_rollup_node/dune b/src/proto_017_PtNairob/bin_sc_rollup_node/dune index 7f2b3df73f1c..ae61acd9e0be 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune @@ -10,10 +10,10 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-017-PtNairob - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands tezos-client-017-PtNairob octez-smart-rollup-node-lib octez_smart_rollup_node_PtNairob) diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune index a2367fbccc48..cf8f8af320db 100644 --- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune +++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune @@ -17,7 +17,7 @@ tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob octez-libs.tezos-crypto - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks octez-libs.tezos-micheline tezos-017-PtNairob-test-helpers octez-libs.tezos-sapling diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index e433969ebab9..4dc05bc19f7f 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-017-PtNairob tezos-protocol-017-PtNairob.parameters octez-libs.tezos-rpc diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune index d7630d672743..ec589ee4ddd1 100644 --- a/src/proto_017_PtNairob/lib_client_commands/dune +++ b/src/proto_017_PtNairob/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-017-PtNairob.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-017-PtNairob uri) (library_flags (:standard -linkall)) @@ -48,10 +48,10 @@ tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-017-PtNairob.commands tezos-client-017-PtNairob.sapling octez-libs.tezos-rpc diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune index cc2542332f3d..0a4c530d8fb3 100644 --- a/src/proto_017_PtNairob/lib_client_sapling/dune +++ b/src/proto_017_PtNairob/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-017-PtNairob tezos-client-017-PtNairob.commands tezos-protocol-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index bb5e7920b3b9..6d9af8c8c1f7 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -12,17 +12,17 @@ tezos-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix - tezos-context-ops + octez-shell-libs.tezos-context-ops octez-libs.tezos-rpc octez-libs.tezos-rpc-http tezos-dal-node-services @@ -57,10 +57,10 @@ tezos-protocol-017-PtNairob octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob octez-libs.tezos-rpc uri) @@ -86,10 +86,10 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob tezos-baking-017-PtNairob-commands octez-libs.tezos-rpc) diff --git a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune index e2dba049aa2c..18efa4dcc847 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune @@ -8,14 +8,14 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob octez-libs.tezos-stdlib-unix - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-017-PtNairob.parameters - tezos-mockup - tezos-mockup-proxy - tezos-mockup-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-proxy + octez-shell-libs.tezos-mockup-commands tezos-baking-017-PtNairob.tenderbrute) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune index 46d46e8f3c94..d276d1ebbf82 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune @@ -5,7 +5,7 @@ (name tenderbrute_main) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob tezos-protocol-017-PtNairob tezos-baking-017-PtNairob.tenderbrute) diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune index 63083e2769f2..98f3afed4d73 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-protocol-017-PtNairob - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_plugin/dune b/src/proto_017_PtNairob/lib_plugin/dune index 385dd6af7b90..e76a6acbd534 100644 --- a/src/proto_017_PtNairob/lib_plugin/dune +++ b/src/proto_017_PtNairob/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_017_PtNairob/lib_protocol/dune b/src/proto_017_PtNairob/lib_protocol/dune index 66b530842afe..2d75dcb4a111 100644 --- a/src/proto_017_PtNairob/lib_protocol/dune +++ b/src/proto_017_PtNairob/lib_protocol/dune @@ -866,7 +866,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-017-PtNairob - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune index 9e9a9730c961..a840e333d63f 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune @@ -16,7 +16,7 @@ tezos-protocol-017-PtNairob.parameters octez-libs.tezos-protocol-environment tezos-protocol-plugin-017-PtNairob - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler octez-libs.tezos-crypto-dal) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index 06c137a20c6c..9f43de445fcf 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-micheline tezos-client-017-PtNairob - tezos-client-base + octez-shell-libs.tezos-client-base tezos-protocol-017-PtNairob.parameters octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune index 3211b998ae2c..8abeaa7c41c6 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune @@ -8,9 +8,9 @@ (libraries octez-libs.tezos-base tezos-protocol-017-PtNairob - tezos-client-commands - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-017-PtNairob octez-smart-rollup tezos-smart-rollup-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index 294c711217ff..8b3adc5b4955 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-017-PtNairob octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers @@ -23,7 +23,7 @@ tezos-dal-node-services tezos-dal-node-lib tezos-dac-lib - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-017-PtNairob tezos-smart-rollup-layer2-017-PtNairob diff --git a/src/proto_018_Proxford/bin_accuser/dune b/src/proto_018_Proxford/bin_accuser/dune index 06c519aed087..31fb64128443 100644 --- a/src/proto_018_Proxford/bin_accuser/dune +++ b/src/proto_018_Proxford/bin_accuser/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune index bc5a89bb1ddd..07fa75445586 100644 --- a/src/proto_018_Proxford/bin_baker/dune +++ b/src/proto_018_Proxford/bin_baker/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_018_Proxford/bin_sc_rollup_node/dune b/src/proto_018_Proxford/bin_sc_rollup_node/dune index 4101d382502f..2c32e311bf41 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_node/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune @@ -10,10 +10,10 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-018-Proxford - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands tezos-client-018-Proxford octez-smart-rollup-node-lib octez_smart_rollup_node_Proxford) diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune index 5edb12823f39..b71d21bd8423 100644 --- a/src/proto_018_Proxford/lib_benchmarks_proto/dune +++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune @@ -17,7 +17,7 @@ tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford octez-libs.tezos-crypto - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks octez-libs.tezos-micheline tezos-018-Proxford-test-helpers octez-libs.tezos-sapling diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune index d59d56191dc6..951f1b12dbf4 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-rpc diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune index d5967eb47986..e645800deeec 100644 --- a/src/proto_018_Proxford/lib_client_commands/dune +++ b/src/proto_018_Proxford/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-018-Proxford uri) (library_flags (:standard -linkall)) @@ -48,10 +48,10 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-018-Proxford.commands tezos-client-018-Proxford.sapling octez-libs.tezos-rpc diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune index 2936cda3a0f1..27cdc3ab74f3 100644 --- a/src/proto_018_Proxford/lib_client_sapling/dune +++ b/src/proto_018_Proxford/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-018-Proxford tezos-client-018-Proxford.commands tezos-protocol-018-Proxford diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index 24cf1a414457..1ba4a59df5f5 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -13,17 +13,17 @@ tezos-protocol-018-Proxford.lifted tezos-protocol-plugin-018-Proxford octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix - tezos-context-ops + octez-shell-libs.tezos-context-ops octez-libs.tezos-rpc octez-libs.tezos-rpc-http tezos-dal-node-services @@ -60,10 +60,10 @@ tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford octez-libs.tezos-rpc uri) @@ -90,10 +90,10 @@ octez-libs.tezos-base tezos-protocol-018-Proxford octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford tezos-baking-018-Proxford-commands octez-libs.tezos-rpc) diff --git a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune index f439baacf9eb..a0ae63f10044 100644 --- a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune @@ -8,14 +8,14 @@ octez-libs.tezos-base tezos-protocol-018-Proxford tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford octez-libs.tezos-stdlib-unix - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-018-Proxford.parameters - tezos-mockup - tezos-mockup-proxy - tezos-mockup-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-proxy + octez-shell-libs.tezos-mockup-commands tezos-baking-018-Proxford.tenderbrute) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune index cb41047c4c68..6d38d37d65cf 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune @@ -5,7 +5,7 @@ (name tenderbrute_main) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-018-Proxford tezos-protocol-018-Proxford tezos-baking-018-Proxford.tenderbrute) diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune index 44af16dfcc4b..b274c96c2ab2 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-protocol-018-Proxford - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-018-Proxford) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_plugin/dune b/src/proto_018_Proxford/lib_plugin/dune index ceb7ffeed6d7..92efc10f00fa 100644 --- a/src/proto_018_Proxford/lib_plugin/dune +++ b/src/proto_018_Proxford/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-018-Proxford tezos-protocol-plugin-018-Proxford - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_018_Proxford/lib_protocol/dune b/src/proto_018_Proxford/lib_protocol/dune index 4e63afed92f3..7ba1ee91f103 100644 --- a/src/proto_018_Proxford/lib_protocol/dune +++ b/src/proto_018_Proxford/lib_protocol/dune @@ -822,7 +822,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-018-Proxford - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune index c9283e9c1ba4..a3c726b1e69d 100644 --- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune +++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune @@ -16,7 +16,7 @@ tezos-protocol-018-Proxford.parameters octez-libs.tezos-protocol-environment tezos-protocol-plugin-018-Proxford - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler octez-libs.tezos-crypto-dal tezos-smart-rollup-018-Proxford) diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index 2516128f9153..15f68c8912c8 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-micheline tezos-client-018-Proxford - tezos-client-base + octez-shell-libs.tezos-client-base tezos-protocol-018-Proxford.parameters octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune index c56f99618df6..784a16f81b15 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_client/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune @@ -8,9 +8,9 @@ (libraries octez-libs.tezos-base tezos-protocol-018-Proxford - tezos-client-commands - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-018-Proxford octez-smart-rollup tezos-smart-rollup-018-Proxford diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index abb96dbe932b..01451cb6dffd 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-018-Proxford octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers @@ -25,7 +25,7 @@ tezos-dac-018-Proxford tezos-dac-lib tezos-dac-client-lib - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-018-Proxford tezos-smart-rollup-layer2-018-Proxford diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 4252519bda43..642fcd2b898e 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-alpha tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 29624ddf49d2..489c98254af2 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-alpha tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 9c74d1dc4c40..3baeeea0ec85 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -10,10 +10,10 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-alpha - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands tezos-client-alpha octez-smart-rollup-node-lib octez_smart_rollup_node_alpha) diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 8f9a0936e776..4b369c3551ee 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -17,7 +17,7 @@ tezos-benchmark-type-inference-alpha tezos-protocol-alpha octez-libs.tezos-crypto - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks octez-libs.tezos-micheline tezos-alpha-test-helpers octez-libs.tezos-sapling diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 3c2a74fbd913..cc9a6445d7fb 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-alpha tezos-protocol-alpha.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-alpha tezos-protocol-alpha.parameters octez-libs.tezos-rpc diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 226e8ca7a0cc..f267ec0326d1 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -12,15 +12,15 @@ tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-alpha uri) (library_flags (:standard -linkall)) @@ -48,10 +48,10 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-alpha.commands tezos-client-alpha.sapling octez-libs.tezos-rpc diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 51d616311ba2..6451985346bc 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-alpha tezos-client-alpha.commands tezos-protocol-alpha diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 46f5443642a0..2fdd4bca09ff 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -13,17 +13,17 @@ tezos-protocol-alpha.lifted tezos-protocol-plugin-alpha octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix - tezos-context-ops + octez-shell-libs.tezos-context-ops octez-libs.tezos-rpc octez-libs.tezos-rpc-http tezos-dal-node-services @@ -60,10 +60,10 @@ tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha octez-libs.tezos-rpc uri) @@ -90,10 +90,10 @@ octez-libs.tezos-base tezos-protocol-alpha octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha tezos-baking-alpha-commands octez-libs.tezos-rpc) diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune index fd23a70fc9d3..7d1e5d0fd582 100644 --- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune @@ -8,14 +8,14 @@ octez-libs.tezos-base tezos-protocol-alpha tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha octez-libs.tezos-stdlib-unix - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-alpha.parameters - tezos-mockup - tezos-mockup-proxy - tezos-mockup-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-proxy + octez-shell-libs.tezos-mockup-commands tezos-baking-alpha.tenderbrute) (flags (:standard) diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index a3884ee08c60..5e79a992f70f 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -5,7 +5,7 @@ (name tenderbrute_main) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-alpha tezos-protocol-alpha tezos-baking-alpha.tenderbrute) diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune index 3c7271584e3a..375cd3bbe226 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-protocol-alpha - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-alpha) (flags (:standard) diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune index 674a18ac17dd..de780c0a1f3d 100644 --- a/src/proto_alpha/lib_plugin/dune +++ b/src/proto_alpha/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-alpha tezos-protocol-plugin-alpha - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index a5405493d29f..a6670fce2cde 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -837,7 +837,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-alpha - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index ec730e07e8be..52bd3a40be55 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -16,7 +16,7 @@ tezos-protocol-alpha.parameters octez-libs.tezos-protocol-environment tezos-protocol-plugin-alpha - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler octez-libs.tezos-crypto-dal tezos-smart-rollup-alpha) diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 045e978788f8..482bc2941f56 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-micheline tezos-client-alpha - tezos-client-base + octez-shell-libs.tezos-client-base tezos-protocol-alpha.parameters octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune index 7114cd3b104c..5dbc0093eb13 100644 --- a/src/proto_alpha/lib_sc_rollup_client/dune +++ b/src/proto_alpha/lib_sc_rollup_client/dune @@ -8,9 +8,9 @@ (libraries octez-libs.tezos-base tezos-protocol-alpha - tezos-client-commands - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-alpha octez-smart-rollup tezos-smart-rollup-alpha diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index 6dbe071ff92f..66d4455e9224 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-alpha octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers @@ -25,7 +25,7 @@ tezos-dac-alpha tezos-dac-lib tezos-dac-client-lib - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-alpha tezos-smart-rollup-layer2-alpha diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune index d7c0f62b6b3e..d65577d83c80 100644 --- a/src/proto_demo_counter/lib_client/dune +++ b/src/proto_demo_counter/lib_client/dune @@ -7,9 +7,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-commands tezos-protocol-demo-counter tezos-protocol-demo-counter.lifted) (library_flags (:standard -linkall)) diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index a6bfd1d55de3..51f66673de01 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -145,7 +145,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-demo-counter - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index f25653c71359..b7fee8b1d615 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -117,7 +117,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-demo-noops - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index fb9b30da4665..1b6481b14ec3 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -7,13 +7,13 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base octez-libs.tezos-protocol-environment tezos-protocol-genesis tezos-protocol-genesis.lifted - tezos-client-commands - tezos-proxy + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-proxy octez-libs.tezos-stdlib-unix) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index b5e824ea8e02..c409da3655bf 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -121,7 +121,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-genesis - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) -- GitLab From 0d251c69c61790fc92c44c4e28e14f08ce480761 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 10 Jul 2023 14:40:27 +0200 Subject: [PATCH 07/13] Manifest: Add libs to octez-proto-libs --- .gitlab/ci/jobs/packaging/opam_package.yml | 63 ++++++++++--------- dune-project | 1 + manifest/main.ml | 21 ++++--- opam/octez-libs.opam | 1 - opam/octez-proto-libs.opam | 31 +++++++++ opam/octez-protocol-compiler.opam | 1 + opam/octez-shell-libs.opam | 1 + opam/tezos-017-PtNairob-test-helpers.opam | 1 + opam/tezos-018-Proxford-test-helpers.opam | 1 + opam/tezos-alpha-test-helpers.opam | 1 + opam/tezos-baking-017-PtNairob-commands.opam | 1 + opam/tezos-baking-017-PtNairob.opam | 1 + opam/tezos-baking-018-Proxford-commands.opam | 1 + opam/tezos-baking-018-Proxford.opam | 1 + opam/tezos-baking-alpha-commands.opam | 1 + opam/tezos-baking-alpha.opam | 1 + opam/tezos-benchmarks-proto-017-PtNairob.opam | 1 + opam/tezos-benchmarks-proto-018-Proxford.opam | 1 + opam/tezos-benchmarks-proto-alpha.opam | 1 + opam/tezos-client-001-PtCJ7pwo.opam | 1 + opam/tezos-client-002-PsYLVpVv.opam | 1 + opam/tezos-client-003-PsddFKi3.opam | 1 + opam/tezos-client-004-Pt24m4xi.opam | 1 + opam/tezos-client-005-PsBabyM1.opam | 1 + opam/tezos-client-006-PsCARTHA.opam | 1 + opam/tezos-client-007-PsDELPH1.opam | 1 + opam/tezos-client-008-PtEdo2Zk.opam | 1 + opam/tezos-client-009-PsFLoren.opam | 1 + opam/tezos-client-010-PtGRANAD.opam | 1 + opam/tezos-client-011-PtHangz2.opam | 1 + opam/tezos-client-012-Psithaca.opam | 1 + opam/tezos-client-013-PtJakart.opam | 1 + opam/tezos-client-014-PtKathma.opam | 1 + opam/tezos-client-015-PtLimaPt.opam | 1 + opam/tezos-client-016-PtMumbai.opam | 1 + opam/tezos-client-017-PtNairob.opam | 1 + opam/tezos-client-018-Proxford.opam | 1 + opam/tezos-client-alpha.opam | 1 + opam/tezos-client-genesis.opam | 1 + .../tezos-embedded-protocol-000-Ps9mPmXa.opam | 2 +- .../tezos-embedded-protocol-001-PtCJ7pwo.opam | 2 +- .../tezos-embedded-protocol-002-PsYLVpVv.opam | 2 +- .../tezos-embedded-protocol-003-PsddFKi3.opam | 2 +- .../tezos-embedded-protocol-004-Pt24m4xi.opam | 2 +- .../tezos-embedded-protocol-005-PsBABY5H.opam | 2 +- .../tezos-embedded-protocol-005-PsBabyM1.opam | 2 +- .../tezos-embedded-protocol-006-PsCARTHA.opam | 2 +- .../tezos-embedded-protocol-007-PsDELPH1.opam | 2 +- .../tezos-embedded-protocol-008-PtEdo2Zk.opam | 2 +- .../tezos-embedded-protocol-008-PtEdoTez.opam | 2 +- .../tezos-embedded-protocol-009-PsFLoren.opam | 2 +- .../tezos-embedded-protocol-010-PtGRANAD.opam | 2 +- .../tezos-embedded-protocol-011-PtHangz2.opam | 2 +- .../tezos-embedded-protocol-012-Psithaca.opam | 2 +- .../tezos-embedded-protocol-013-PtJakart.opam | 2 +- .../tezos-embedded-protocol-014-PtKathma.opam | 2 +- .../tezos-embedded-protocol-015-PtLimaPt.opam | 2 +- .../tezos-embedded-protocol-016-PtMumbai.opam | 2 +- .../tezos-embedded-protocol-017-PtNairob.opam | 2 +- .../tezos-embedded-protocol-018-Proxford.opam | 2 +- opam/tezos-embedded-protocol-alpha.opam | 2 +- .../tezos-embedded-protocol-demo-counter.opam | 2 +- opam/tezos-embedded-protocol-demo-noops.opam | 2 +- opam/tezos-embedded-protocol-genesis.opam | 2 +- opam/tezos-protocol-000-Ps9mPmXa.opam | 2 +- opam/tezos-protocol-001-PtCJ7pwo.opam | 2 +- opam/tezos-protocol-002-PsYLVpVv.opam | 2 +- opam/tezos-protocol-003-PsddFKi3.opam | 2 +- opam/tezos-protocol-004-Pt24m4xi.opam | 2 +- opam/tezos-protocol-005-PsBABY5H.opam | 2 +- opam/tezos-protocol-005-PsBabyM1.opam | 2 +- opam/tezos-protocol-006-PsCARTHA.opam | 2 +- opam/tezos-protocol-007-PsDELPH1.opam | 2 +- opam/tezos-protocol-008-PtEdo2Zk.opam | 2 +- opam/tezos-protocol-008-PtEdoTez.opam | 2 +- opam/tezos-protocol-009-PsFLoren.opam | 2 +- opam/tezos-protocol-010-PtGRANAD.opam | 2 +- opam/tezos-protocol-011-PtHangz2.opam | 1 + opam/tezos-protocol-012-Psithaca.opam | 1 + opam/tezos-protocol-013-PtJakart.opam | 1 + opam/tezos-protocol-014-PtKathma.opam | 1 + opam/tezos-protocol-015-PtLimaPt.opam | 1 + opam/tezos-protocol-016-PtMumbai.opam | 1 + opam/tezos-protocol-017-PtNairob-tests.opam | 1 + opam/tezos-protocol-017-PtNairob.opam | 1 + opam/tezos-protocol-018-Proxford-tests.opam | 1 + opam/tezos-protocol-018-Proxford.opam | 1 + opam/tezos-protocol-alpha-tests.opam | 1 + opam/tezos-protocol-alpha.opam | 1 + opam/tezos-protocol-demo-counter.opam | 2 +- opam/tezos-protocol-demo-noops.opam | 2 +- opam/tezos-protocol-genesis.opam | 2 +- src/lib_base/index.mld | 1 - src/lib_mockup/dune | 4 +- src/lib_mockup_proxy/dune | 2 +- src/lib_protocol_compiler/dune | 8 +-- src/lib_protocol_compiler/registerer/dune | 2 +- src/lib_protocol_environment/context_ops/dune | 2 +- src/lib_protocol_environment/dune | 8 ++- src/lib_protocol_environment/index.mld | 1 + .../shell_context/dune | 2 +- .../sigs-internals/dune | 2 +- src/lib_protocol_environment/sigs/dune | 4 +- src/lib_protocol_environment/structs/dune | 2 +- src/lib_protocol_environment/test/dune | 4 +- .../test_shell_context/dune | 2 +- src/lib_protocol_updater/dune | 2 +- src/lib_proxy/dune | 2 +- src/lib_shell/dune | 2 +- src/lib_store/mocked/dune | 2 +- src/lib_store/unix/dune | 2 +- src/proto_000_Ps9mPmXa/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_001_PtCJ7pwo/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_002_PsYLVpVv/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_003_PsddFKi3/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_004_Pt24m4xi/lib_protocol/dune | 16 ++--- src/proto_005_PsBABY5H/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_005_PsBabyM1/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_006_PsCARTHA/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_007_PsDELPH1/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_008_PtEdo2Zk/lib_protocol/dune | 16 ++--- src/proto_008_PtEdoTez/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_009_PsFLoren/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_010_PtGRANAD/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_011_PtHangz2/lib_parameters/dune | 2 +- src/proto_011_PtHangz2/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_012_Psithaca/lib_parameters/dune | 2 +- src/proto_012_Psithaca/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_013_PtJakart/lib_parameters/dune | 2 +- src/proto_013_PtJakart/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_014_PtKathma/lib_parameters/dune | 2 +- src/proto_014_PtKathma/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_015_PtLimaPt/lib_parameters/dune | 2 +- src/proto_015_PtLimaPt/lib_protocol/dune | 16 ++--- .../lib_client_commands/dune | 4 +- src/proto_016_PtMumbai/lib_parameters/dune | 2 +- src/proto_016_PtMumbai/lib_protocol/dune | 16 ++--- .../lib_benchmarks_proto/dune | 2 +- .../lib_client_commands/dune | 4 +- src/proto_017_PtNairob/lib_delegate/dune | 6 +- src/proto_017_PtNairob/lib_parameters/dune | 2 +- src/proto_017_PtNairob/lib_protocol/dune | 16 ++--- .../lib_protocol/test/helpers/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- .../lib_benchmarks_proto/dune | 2 +- .../lib_client_commands/dune | 4 +- src/proto_018_Proxford/lib_delegate/dune | 6 +- src/proto_018_Proxford/lib_parameters/dune | 2 +- src/proto_018_Proxford/lib_protocol/dune | 16 ++--- .../lib_protocol/test/helpers/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- src/proto_alpha/lib_benchmarks_proto/dune | 2 +- src/proto_alpha/lib_client_commands/dune | 4 +- src/proto_alpha/lib_delegate/dune | 6 +- src/proto_alpha/lib_parameters/dune | 2 +- src/proto_alpha/lib_protocol/dune | 16 ++--- .../lib_protocol/test/helpers/dune | 2 +- src/proto_alpha/lib_protocol/test/unit/dune | 2 +- src/proto_demo_counter/lib_protocol/dune | 16 ++--- src/proto_demo_noops/lib_protocol/dune | 16 ++--- src/proto_genesis/lib_client/dune | 2 +- src/proto_genesis/lib_protocol/dune | 16 ++--- 177 files changed, 459 insertions(+), 372 deletions(-) create mode 100644 opam/octez-proto-libs.opam diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 11945d2580c4..ffc08e53e363 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -549,17 +549,24 @@ opam:octez-node-config: variables: package: octez-node-config +opam:octez-proto-libs: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: octez-proto-libs + opam:octez-protocol-compiler: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_5 + - .rules_template__trigger_exec_opam_batch_6 variables: package: octez-protocol-compiler opam:octez-proxy-server: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_2 + - .rules_template__trigger_exec_opam_batch_1 variables: package: octez-proxy-server @@ -582,7 +589,7 @@ opam:octez-signer: opam:octez-smart-rollup: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: octez-smart-rollup @@ -638,7 +645,7 @@ opam:octez-smart-rollup-node-lib: opam:octez-smart-rollup-wasm-debugger: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_2 + - .rules_template__trigger_exec_opam_batch_1 variables: package: octez-smart-rollup-wasm-debugger @@ -657,7 +664,7 @@ opam:octez-smart-rollup-wasm-debugger: opam:tezos-017-PtNairob-test-helpers: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_1 variables: package: tezos-017-PtNairob-test-helpers @@ -720,7 +727,7 @@ opam:tezos-baking-alpha-commands: opam:tezos-benchmark: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-benchmark @@ -847,42 +854,42 @@ opam:tezos-client-013-PtJakart: opam:tezos-client-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-014-PtKathma opam:tezos-client-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-015-PtLimaPt opam:tezos-client-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-client-016-PtMumbai opam:tezos-client-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-client-017-PtNairob opam:tezos-client-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-client-018-Proxford opam:tezos-client-alpha: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-client-alpha @@ -940,7 +947,7 @@ opam:tezos-dac-lib: opam:tezos-dac-node-lib: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-dac-node-lib @@ -962,7 +969,7 @@ opam:tezos-dal-node-lib: opam:tezos-dal-node-services: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-dal-node-services @@ -1144,7 +1151,7 @@ opam:tezos-embedded-protocol-genesis: opam:tezos-layer2-store: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-layer2-store @@ -1273,35 +1280,35 @@ opam:tezos-protocol-011-PtHangz2: opam:tezos-protocol-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-012-Psithaca opam:tezos-protocol-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-013-PtJakart opam:tezos-protocol-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-014-PtKathma opam:tezos-protocol-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-015-PtLimaPt opam:tezos-protocol-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-016-PtMumbai @@ -1461,7 +1468,7 @@ opam:tezos-protocol-plugin-014-PtKathma: opam:tezos-protocol-plugin-014-PtKathma-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-014-PtKathma-registerer @@ -1475,7 +1482,7 @@ opam:tezos-protocol-plugin-015-PtLimaPt: opam:tezos-protocol-plugin-015-PtLimaPt-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-015-PtLimaPt-registerer @@ -1489,7 +1496,7 @@ opam:tezos-protocol-plugin-016-PtMumbai: opam:tezos-protocol-plugin-016-PtMumbai-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-016-PtMumbai-registerer @@ -1503,7 +1510,7 @@ opam:tezos-protocol-plugin-017-PtNairob: opam:tezos-protocol-plugin-017-PtNairob-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-017-PtNairob-registerer @@ -1564,7 +1571,7 @@ opam:tezos-scoru-wasm-fast: opam:tezos-scoru-wasm-helpers: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-scoru-wasm-helpers @@ -1577,7 +1584,7 @@ opam:tezos-scoru-wasm-helpers: opam:tezos-smart-rollup-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-smart-rollup-016-PtMumbai @@ -1607,14 +1614,14 @@ opam:tezos-smart-rollup-alpha: opam:tezos-smart-rollup-layer2-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-smart-rollup-layer2-017-PtNairob opam:tezos-smart-rollup-layer2-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-smart-rollup-layer2-018-Proxford diff --git a/dune-project b/dune-project index 7da99a0ffef7..178a87c51d8e 100644 --- a/dune-project +++ b/dune-project @@ -28,6 +28,7 @@ (package (name octez-libs)) (package (name octez-node)) (package (name octez-node-config)) +(package (name octez-proto-libs)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) (package (name octez-shell-libs)) diff --git a/manifest/main.ml b/manifest/main.ml index dd0b995165ce..fd2bdc903426 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -484,7 +484,7 @@ let octez_shell_lib : Sub_lib.maker = (* Registers a sub-library in the [octez-proto-libs] package. This package should contain all the libraries related to the protocol. *) -let _octez_proto_lib : Sub_lib.maker = +let octez_proto_lib : Sub_lib.maker = Sub_lib.sub_lib ~package_synopsis:"Octez protocol libraries" ~container:registered_octez_proto_libs @@ -2889,12 +2889,12 @@ let _octez_sapling_ctypes_gen = ["rustzcash_ctypes_gen"; "rustzcash_ctypes_bindings"; "gen_runtime_js"] let tezos_protocol_environment_sigs_internals = - octez_lib + octez_proto_lib "tezos-protocol-environment.sigs-internals" ~path:"src/lib_protocol_environment/sigs-internals" let tezos_protocol_environment_sigs = - octez_lib + octez_proto_lib "tezos-protocol-environment.sigs" ~path:"src/lib_protocol_environment/sigs" ~deps:[tezos_protocol_environment_sigs_internals] @@ -2925,7 +2925,7 @@ let tezos_protocol_environment_sigs = List.init (latest_environment_number + 1) gen |> Dune.of_list) let octez_protocol_environment_structs = - octez_lib + octez_proto_lib "tezos-protocol-environment.structs" ~path:"src/lib_protocol_environment/structs" ~deps: @@ -2940,9 +2940,10 @@ let octez_protocol_environment_structs = ] let octez_protocol_environment = - octez_lib + octez_proto_lib "tezos-protocol-environment" ~path:"src/lib_protocol_environment" + ~documentation:[Dune.[S "package"; S "octez-proto-libs"]] ~deps: [ zarith; @@ -2984,7 +2985,7 @@ let _octez_protocol_environment_tests = "test_data_encoding"; ] ~path:"src/lib_protocol_environment/test" - ~opam:"octez-libs" + ~opam:"octez-proto-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3090,7 +3091,7 @@ let octez_protocol_compiler_lib = ~enabled_if:[S ">="; S "%{ocaml_version}"; S "5"]; targets_rule ["embedded-interfaces-env"] - ~deps:[Dune.(H [[S "package"; S "octez-libs"]])] + ~deps:[Dune.(H [[S "package"; S "octez-proto-libs"]])] ~action: [ S "with-stdout-to"; @@ -3101,13 +3102,13 @@ let octez_protocol_compiler_lib = V [ S - "%{lib:octez-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa}"; + "%{lib:octez-proto-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa}"; ]; ]; ]; targets_rule ["embedded_cmis_env.ml"] - ~deps:[Dune.(H [[S "package"; S "octez-libs"]])] + ~deps:[Dune.(H [[S "package"; S "octez-proto-libs"]])] ~action: [ S "run"; @@ -8213,7 +8214,7 @@ let () = in Sub_lib.pp_documentation_of_container ~header fmt registered_octez_proto_libs -(* Generate documentation index for Octez-l2-libs *) +(* Generate documentation index for [octez-l2-libs] *) let () = write "src/lib_smart_rollup/index.mld" @@ fun fmt -> let header = diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 3a86d28b28b4..73271b0b55b7 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -65,7 +65,6 @@ depends: [ "integers_stubs_js" "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } - "class_group_vdf" { >= "0.0.4" } "resto-cohttp" { >= "1.2" } "resto-cohttp-client" { >= "1.2" } "resto-cohttp-server" { >= "1.2" } diff --git a/opam/octez-proto-libs.opam b/opam/octez-proto-libs.opam new file mode 100644 index 000000000000..d621e3217c81 --- /dev/null +++ b/opam/octez-proto-libs.opam @@ -0,0 +1,31 @@ +# This file was automatically generated, do not edit. +# Edit file manifest/main.ml instead. +opam-version: "2.0" +maintainer: "contact@tezos.com" +authors: ["Tezos devteam"] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" +license: "MIT" +depends: [ + "dune" { >= "3.0" } + "ocaml" { >= "4.14" } + "octez-libs" + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "bls12-381" + "zarith" { >= "1.12" & < "1.13" } + "zarith_stubs_js" + "class_group_vdf" { >= "0.0.4" } + "aches" { >= "1.0.0" } + "aches-lwt" { >= "1.0.0" } + "tezt" { with-test & >= "3.1.1" } + "octez-alcotezt" {with-test} + "qcheck-alcotest" { with-test & >= "0.20" } + "lwt" { with-test & >= "5.7.0" } +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Octez protocol libraries" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index e7ff7a873b7c..47639fa2b1a9 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" + "octez-proto-libs" "lwt" { >= "5.7.0" } "ocp-ocamlres" { >= "0.4" } "base-unix" diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam index c9f207bdb004..8260b46d6574 100644 --- a/opam/octez-shell-libs.opam +++ b/opam/octez-shell-libs.opam @@ -14,6 +14,7 @@ depends: [ "tezt" { >= "3.1.1" } "octez-alcotezt" {with-test} "astring" {with-test} + "octez-proto-libs" "octez-protocol-compiler" "lwt-exit" "tezos-version" diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam index be975f03d838..fbdfd3046e34 100644 --- a/opam/tezos-017-PtNairob-test-helpers.opam +++ b/opam/tezos-017-PtNairob-test-helpers.opam @@ -14,6 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" + "octez-proto-libs" "tezos-protocol-plugin-017-PtNairob" "octez-shell-libs" ] diff --git a/opam/tezos-018-Proxford-test-helpers.opam b/opam/tezos-018-Proxford-test-helpers.opam index 4f3a7dc9071e..f5cef06ca8a0 100644 --- a/opam/tezos-018-Proxford-test-helpers.opam +++ b/opam/tezos-018-Proxford-test-helpers.opam @@ -14,6 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" + "octez-proto-libs" "tezos-protocol-plugin-018-Proxford" "octez-shell-libs" "tezos-smart-rollup-018-Proxford" diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 214b722d92a6..2b020742d02c 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -14,6 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" + "octez-proto-libs" "tezos-protocol-plugin-alpha" "octez-shell-libs" "tezos-smart-rollup-alpha" diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam index 821b15ea9b9c..e342ad58e507 100644 --- a/opam/tezos-baking-017-PtNairob-commands.opam +++ b/opam/tezos-baking-017-PtNairob-commands.opam @@ -12,6 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-017-PtNairob" + "octez-proto-libs" "octez-shell-libs" "tezos-client-017-PtNairob" "tezos-baking-017-PtNairob" diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index 89e33af8b7a8..e6f42be8529f 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -14,6 +14,7 @@ depends: [ "tezos-version" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" + "octez-proto-libs" "octez-shell-libs" "tezos-client-017-PtNairob" "tezos-dal-node-services" diff --git a/opam/tezos-baking-018-Proxford-commands.opam b/opam/tezos-baking-018-Proxford-commands.opam index 647959d6768a..dee22181e02b 100644 --- a/opam/tezos-baking-018-Proxford-commands.opam +++ b/opam/tezos-baking-018-Proxford-commands.opam @@ -12,6 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-018-Proxford" + "octez-proto-libs" "octez-shell-libs" "tezos-client-018-Proxford" "tezos-baking-018-Proxford" diff --git a/opam/tezos-baking-018-Proxford.opam b/opam/tezos-baking-018-Proxford.opam index b90855b8a4d8..85dbb2f6e4d4 100644 --- a/opam/tezos-baking-018-Proxford.opam +++ b/opam/tezos-baking-018-Proxford.opam @@ -14,6 +14,7 @@ depends: [ "tezos-version" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" + "octez-proto-libs" "octez-shell-libs" "tezos-client-018-Proxford" "tezos-dal-node-services" diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index 164ebde22c21..5d068aa1b8af 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -12,6 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-alpha" + "octez-proto-libs" "octez-shell-libs" "tezos-client-alpha" "tezos-baking-alpha" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 0fe4c7f8a2ce..7eec4c8750b1 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -14,6 +14,7 @@ depends: [ "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" + "octez-proto-libs" "octez-shell-libs" "tezos-client-alpha" "tezos-dal-node-services" diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam index 05c583edaf29..8d4b8cd1c08b 100644 --- a/opam/tezos-benchmarks-proto-017-PtNairob.opam +++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam @@ -19,6 +19,7 @@ depends: [ "tezos-017-PtNairob-test-helpers" "tezos-client-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-benchmarks-proto-018-Proxford.opam b/opam/tezos-benchmarks-proto-018-Proxford.opam index f35446ec01f9..61c10ab40b58 100644 --- a/opam/tezos-benchmarks-proto-018-Proxford.opam +++ b/opam/tezos-benchmarks-proto-018-Proxford.opam @@ -19,6 +19,7 @@ depends: [ "tezos-018-Proxford-test-helpers" "tezos-client-018-Proxford" "tezos-protocol-plugin-018-Proxford" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index 241d5a6140f1..d76e5d4a095d 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -19,6 +19,7 @@ depends: [ "tezos-alpha-test-helpers" "tezos-client-alpha" "tezos-protocol-plugin-alpha" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index 41c7bf242b2f..a7675bae5b8e 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -14,6 +14,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-001-PtCJ7pwo" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index db796817cce8..4f14ba8cc848 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -14,6 +14,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-002-PsYLVpVv" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index ba7df41180c9..5a536db3982e 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -14,6 +14,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-003-PsddFKi3" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index ec4035ab5fa0..1095d164b458 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -14,6 +14,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-004-Pt24m4xi" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 5393b5e8bb1c..f2a4db2f2b9d 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -14,6 +14,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-005-PsBabyM1" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index 38fb76a9a590..7888a8cc34d7 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -14,6 +14,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-006-PsCARTHA" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index 8af67d292684..10e34130c530 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -15,6 +15,7 @@ depends: [ "tezos-protocol-007-PsDELPH1" "tezos-protocol-plugin-007-PsDELPH1" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 2d77716de7ef..8f13c37f06d2 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -15,6 +15,7 @@ depends: [ "tezos-protocol-008-PtEdo2Zk" "tezos-protocol-plugin-008-PtEdo2Zk" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 04aa23d7abaf..1df8299d1c5f 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-009-PsFLoren" "tezos-protocol-plugin-009-PsFLoren" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 307ff3c68518..32026eee23eb 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-010-PtGRANAD" "tezos-protocol-plugin-010-PtGRANAD" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index 35c312ae4645..55234da17610 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-011-PtHangz2" "tezos-protocol-plugin-011-PtHangz2" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 95f90c67b732..8518be735a5f 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index 31417b714fd2..3b5ab7cfef4d 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 0f88f1d97d87..7ec32415f93b 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index c2b808d14113..b8be855704f1 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -16,6 +16,7 @@ depends: [ "tezos-protocol-015-PtLimaPt" "tezos-protocol-plugin-015-PtLimaPt" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index 557de11fc2f3..f59659e4d14c 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -17,6 +17,7 @@ depends: [ "tezos-protocol-plugin-016-PtMumbai" "tezos-smart-rollup-016-PtMumbai" "uri" { >= "3.1.0" } + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index e9f37e4e4951..a35c459577dc 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -17,6 +17,7 @@ depends: [ "tezos-protocol-plugin-017-PtNairob" "tezos-smart-rollup-017-PtNairob" "uri" { >= "3.1.0" } + "octez-proto-libs" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-018-Proxford.opam b/opam/tezos-client-018-Proxford.opam index 28237a25a1a6..7e68da963275 100644 --- a/opam/tezos-client-018-Proxford.opam +++ b/opam/tezos-client-018-Proxford.opam @@ -17,6 +17,7 @@ depends: [ "tezos-protocol-plugin-018-Proxford" "tezos-smart-rollup-018-Proxford" "uri" { >= "3.1.0" } + "octez-proto-libs" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 9c0cb8cf2a83..48991ce7e6aa 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -17,6 +17,7 @@ depends: [ "tezos-protocol-plugin-alpha" "tezos-smart-rollup-alpha" "uri" { >= "3.1.0" } + "octez-proto-libs" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 88b3f93efe7d..e265dac00e0c 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -12,6 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "octez-shell-libs" + "octez-proto-libs" "tezos-protocol-genesis" ] build: [ diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index 453a8e21e08f..5e55635f9a5e 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-000-Ps9mPmXa" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index 6016c3ae0882..c536aa989120 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-001-PtCJ7pwo" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 881b1dd8267b..c902f863e473 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-002-PsYLVpVv" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 581c51a54aa7..35b65e459665 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-003-PsddFKi3" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index 9be443bac03f..13002ff70bfc 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-004-Pt24m4xi" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index cb1dcce66bcd..6680e5a2cb45 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-005-PsBABY5H" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index 2e4570512180..c2557895d99e 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-005-PsBabyM1" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index f0cffaaf41c9..126de3ccbf99 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-006-PsCARTHA" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index 5b13bda3c2b0..754ad53a8c77 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-007-PsDELPH1" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index 5abc4efd5efa..7d55b520222a 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdo2Zk" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index 2ba391ec5c86..08730b5499ab 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdoTez" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index b6632f6f7307..a910a6d56dcf 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-009-PsFLoren" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index a5e51a7758b1..6522e393a051 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-010-PtGRANAD" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index 5131411c183b..7fbc44f8c405 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-011-PtHangz2" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index ba7857cab183..9dcc11d3befe 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-012-Psithaca" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index 570fb630c69b..66d8f2a5a881 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-013-PtJakart" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam index 29f42760fe8d..09138c0f0b66 100644 --- a/opam/tezos-embedded-protocol-014-PtKathma.opam +++ b/opam/tezos-embedded-protocol-014-PtKathma.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-014-PtKathma" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam index 3d1103ab73dd..ed60ffe02ae6 100644 --- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam +++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-015-PtLimaPt" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam index 8acc83ccca98..ab4fc88393aa 100644 --- a/opam/tezos-embedded-protocol-016-PtMumbai.opam +++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-016-PtMumbai" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-017-PtNairob.opam b/opam/tezos-embedded-protocol-017-PtNairob.opam index dc0d3013bf8b..1414b3e939ce 100644 --- a/opam/tezos-embedded-protocol-017-PtNairob.opam +++ b/opam/tezos-embedded-protocol-017-PtNairob.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-017-PtNairob" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-018-Proxford.opam b/opam/tezos-embedded-protocol-018-Proxford.opam index 256393547315..ef9de1c2ed12 100644 --- a/opam/tezos-embedded-protocol-018-Proxford.opam +++ b/opam/tezos-embedded-protocol-018-Proxford.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-018-Proxford" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index 39bd4308b422..4a45e0c9714c 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-alpha" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index 045e611ee599..c77d036da4c0 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-demo-counter" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index 68c933f06a7a..79e0d5aaa631 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-demo-noops" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index 1379ae7dcf19..6f0dd91ec31b 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-genesis" "octez-shell-libs" - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam index 6508d19384d0..641757dccd9f 100644 --- a/opam/tezos-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-protocol-000-Ps9mPmXa.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam index e9b75c8768ec..a5e329cc4df3 100644 --- a/opam/tezos-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-protocol-001-PtCJ7pwo.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam index 9f358ea2cae2..082c793e2386 100644 --- a/opam/tezos-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-protocol-002-PsYLVpVv.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam index 114213d699b7..86f02e1d9b9b 100644 --- a/opam/tezos-protocol-003-PsddFKi3.opam +++ b/opam/tezos-protocol-003-PsddFKi3.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-protocol-004-Pt24m4xi.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-005-PsBABY5H.opam +++ b/opam/tezos-protocol-005-PsBABY5H.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-005-PsBabyM1.opam +++ b/opam/tezos-protocol-005-PsBabyM1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-006-PsCARTHA.opam +++ b/opam/tezos-protocol-006-PsCARTHA.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-007-PsDELPH1.opam +++ b/opam/tezos-protocol-007-PsDELPH1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-008-PtEdoTez.opam +++ b/opam/tezos-protocol-008-PtEdoTez.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index 2d1734439539..02a3fd6fbdd2 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 352fe9c277ed..83dd7cbfc157 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -23,6 +23,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-017-PtNairob" {with-test} "octez-shell-libs" {with-test} + "octez-proto-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-017-PtNairob.opam +++ b/opam/tezos-protocol-017-PtNairob.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index c4211bc5bf94..66ff32ce9bad 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -23,6 +23,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-018-Proxford" {with-test} "octez-shell-libs" {with-test} + "octez-proto-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-018-Proxford.opam b/opam/tezos-protocol-018-Proxford.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-018-Proxford.opam +++ b/opam/tezos-protocol-018-Proxford.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 5e4f0ad98402..dc9844d0069c 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -23,6 +23,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-alpha" {with-test} "octez-shell-libs" {with-test} + "octez-proto-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index 2d1734439539..13ada1b044d8 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam index 573c97ff0ce6..5189adf67260 100644 --- a/opam/tezos-protocol-demo-counter.opam +++ b/opam/tezos-protocol-demo-counter.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam index 58e072e152b9..90ae889e15eb 100644 --- a/opam/tezos-protocol-demo-noops.opam +++ b/opam/tezos-protocol-demo-noops.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam index 862fbf9c350c..a7a5fc847727 100644 --- a/opam/tezos-protocol-genesis.opam +++ b/opam/tezos-protocol-genesis.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index e1a17fb41ca9..2d2bce730d39 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -39,7 +39,6 @@ It contains the following libraries: - {{!module-Tezos_micheline}Tezos_micheline}: Internal AST and parser for the Michelson language - {{!module-Tezos_p2p}Tezos_p2p}: Library for a pool of P2P connections - {{!module-Tezos_p2p_services}Tezos_p2p_services}: Descriptions of RPCs exported by [tezos-p2p] -- {{!module-Tezos_protocol_environment}Tezos_protocol_environment} - {{!module-Tezos_requester}Tezos_requester} - {{!module-Tezos_rpc}Tezos_rpc}: Library of auto-documented RPCs (service and hierarchy descriptions) - {{!module-Tezos_rpc_http}Tezos_rpc_http}: Library of auto-documented RPCs (http server and client) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 8076b62f4c21..389f46d5b7ac 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-shell-libs.tezos-client-base octez-shell-libs.tezos-shell-services - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment uri) (flags (:standard) @@ -29,7 +29,7 @@ octez-libs.tezos-rpc octez-libs.tezos-p2p-services octez-libs.tezos-p2p - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index 83cd2776d8de..a150b600700f 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-shell-libs.tezos-client-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-rpc-http resto-cohttp-self-serving-client octez-libs.tezos-rpc-http-client diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 508b9b4a8bc8..85964e5f7fb5 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment.sigs octez-libs.tezos-stdlib-unix compiler-libs.common lwt.unix @@ -39,17 +39,17 @@ (rule (targets embedded-interfaces-env) - (deps (package octez-libs)) + (deps (package octez-proto-libs)) (action (with-stdout-to %{targets} (run bin/cmis_of_cma.exe - %{lib:octez-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa})))) + %{lib:octez-proto-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa})))) (rule (targets embedded_cmis_env.ml) - (deps (package octez-libs)) + (deps (package octez-proto-libs)) (action (run %{bin:ocp-ocamlres} -format variants -o %{targets} diff --git a/src/lib_protocol_compiler/registerer/dune b/src/lib_protocol_compiler/registerer/dune index 2552049fc3e8..16fe84883514 100644 --- a/src/lib_protocol_compiler/registerer/dune +++ b/src/lib_protocol_compiler/registerer/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -opaque diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune index f3e640ddb4bf..b469bb868753 100644 --- a/src/lib_protocol_environment/context_ops/dune +++ b/src/lib_protocol_environment/context_ops/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-error-monad - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-context octez-shell-libs.tezos-shell-context) (flags diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index 4777ff32eec6..c682b11b3915 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_environment) - (public_name octez-libs.tezos-protocol-environment) + (public_name octez-proto-libs.tezos-protocol-environment) (instrumentation (backend bisect_ppx)) (libraries zarith @@ -16,8 +16,8 @@ aches-lwt octez-libs.tezos-base octez-libs.tezos-sapling - octez-libs.tezos-protocol-environment.sigs - octez-libs.tezos-protocol-environment.structs + octez-proto-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment.structs octez-libs.tezos-micheline octez-libs.tezos-context.memory octez-libs.tezos-scoru-wasm @@ -27,3 +27,5 @@ -open Plonk -open Tezos_base.TzPervasives -open Tezos_micheline)) + +(documentation (package octez-proto-libs)) diff --git a/src/lib_protocol_environment/index.mld b/src/lib_protocol_environment/index.mld index 2cc6c68e3ada..88edc6d4abbc 100644 --- a/src/lib_protocol_environment/index.mld +++ b/src/lib_protocol_environment/index.mld @@ -4,3 +4,4 @@ This is a package containing some libraries related to the Tezos protocol. It contains the following libraries: +- {{!module-Tezos_protocol_environment}Tezos_protocol_environment} diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune index c4192c0d5862..26bc415543e5 100644 --- a/src/lib_protocol_environment/shell_context/dune +++ b/src/lib_protocol_environment/shell_context/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-context) (flags (:standard) diff --git a/src/lib_protocol_environment/sigs-internals/dune b/src/lib_protocol_environment/sigs-internals/dune index 01a3d1d18901..4845799f3694 100644 --- a/src/lib_protocol_environment/sigs-internals/dune +++ b/src/lib_protocol_environment/sigs-internals/dune @@ -3,5 +3,5 @@ (library (name tezos_protocol_environment_sigs_internals) - (public_name octez-libs.tezos-protocol-environment.sigs-internals) + (public_name octez-proto-libs.tezos-protocol-environment.sigs-internals) (instrumentation (backend bisect_ppx))) diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune index 103e69c8e5ab..da8cace5c324 100644 --- a/src/lib_protocol_environment/sigs/dune +++ b/src/lib_protocol_environment/sigs/dune @@ -3,10 +3,10 @@ (library (name tezos_protocol_environment_sigs) - (public_name octez-libs.tezos-protocol-environment.sigs) + (public_name octez-proto-libs.tezos-protocol-environment.sigs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment.sigs-internals) + octez-proto-libs.tezos-protocol-environment.sigs-internals) (flags (:standard) -nostdlib diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 7d13771ab19d..705540059c4b 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_environment_structs) - (public_name octez-libs.tezos-protocol-environment.structs) + (public_name octez-proto-libs.tezos-protocol-environment.structs) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 043adafc6556..b4478e6ff8e4 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base.unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-alcotezt octez-libs.tezos-test-helpers qcheck-alcotest @@ -39,7 +39,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-proto-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index e72e58104b38..bdd63df2989c 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -10,7 +10,7 @@ octez-alcotezt octez-libs.tezos-test-helpers octez-libs.tezos-base - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index 633f9972534a..6ae3f3afc51b 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -10,7 +10,7 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline octez-shell-libs.tezos-shell-services - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-context octez-protocol-compiler.registerer octez-protocol-compiler.native diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index 50a47c775ce4..2a0f982b3441 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -11,7 +11,7 @@ octez-libs.tezos-base octez-libs.tezos-clic octez-shell-libs.tezos-client-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-rpc octez-shell-libs.tezos-shell-services octez-libs.tezos-context.memory diff --git a/src/lib_shell/dune b/src/lib_shell/dune index d432ec58a728..033686baf67c 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -15,7 +15,7 @@ octez-libs.tezos-context octez-shell-libs.tezos-store octez-shell-libs.tezos-store.shared - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-context-ops octez-shell-libs.tezos-shell-context octez-libs.tezos-p2p diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune index e674425ec6a5..032228ea3618 100644 --- a/src/lib_store/mocked/dune +++ b/src/lib_store/mocked/dune @@ -13,7 +13,7 @@ octez-libs.tezos-context.memory octez-shell-libs.tezos-context-ops octez-shell-libs.tezos-validation - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-store.shared) (flags (:standard) diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune index 03b48efccfc3..b7373e9100b1 100644 --- a/src/lib_store/unix/dune +++ b/src/lib_store/unix/dune @@ -12,7 +12,7 @@ index irmin-pack octez-shell-libs.tezos-store.shared - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-context octez-shell-libs.tezos-context-ops octez-shell-libs.tezos-shell-context diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index f70d0a1b24f1..f3b8640d42bc 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-000-Ps9mPmXa.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_000_Ps9mPmXa)) @@ -39,8 +39,8 @@ (public_name tezos-protocol-000-Ps9mPmXa) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-000-Ps9mPmXa.raw) (flags (:standard) @@ -84,8 +84,8 @@ (public_name tezos-protocol-000-Ps9mPmXa.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-000-Ps9mPmXa) (flags (:standard) @@ -104,8 +104,8 @@ (library (name tezos_protocol_000_Ps9mPmXa_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -131,7 +131,7 @@ (libraries tezos-protocol-000-Ps9mPmXa octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index ba8fe49c3151..0e5e4f4f7a8f 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-001-PtCJ7pwo @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-001-PtCJ7pwo diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index 87c587a9a0b5..6ae0d2aaac91 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-001-PtCJ7pwo.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_001_PtCJ7pwo)) @@ -106,8 +106,8 @@ (public_name tezos-protocol-001-PtCJ7pwo) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-001-PtCJ7pwo.raw) (flags (:standard) @@ -217,8 +217,8 @@ (public_name tezos-protocol-001-PtCJ7pwo.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-001-PtCJ7pwo) (flags (:standard) @@ -237,8 +237,8 @@ (library (name tezos_protocol_001_PtCJ7pwo_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -329,7 +329,7 @@ (libraries tezos-protocol-001-PtCJ7pwo octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index e88251614fa6..a9ddd8b6055d 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-002-PsYLVpVv @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-002-PsYLVpVv diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 0779df23f73d..6fb33ad4f300 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-002-PsYLVpVv.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_002_PsYLVpVv)) @@ -106,8 +106,8 @@ (public_name tezos-protocol-002-PsYLVpVv) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-002-PsYLVpVv.raw) (flags (:standard) @@ -217,8 +217,8 @@ (public_name tezos-protocol-002-PsYLVpVv.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-002-PsYLVpVv) (flags (:standard) @@ -237,8 +237,8 @@ (library (name tezos_protocol_002_PsYLVpVv_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -329,7 +329,7 @@ (libraries tezos-protocol-002-PsYLVpVv octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index 77c5b0790d9b..ccd279d0efe5 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-003-PsddFKi3 @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-003-PsddFKi3 diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index b39496be313e..f28b37ccf827 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-003-PsddFKi3.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_003_PsddFKi3)) @@ -107,8 +107,8 @@ (public_name tezos-protocol-003-PsddFKi3) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-003-PsddFKi3.raw) (flags (:standard) @@ -219,8 +219,8 @@ (public_name tezos-protocol-003-PsddFKi3.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-003-PsddFKi3) (flags (:standard) @@ -239,8 +239,8 @@ (library (name tezos_protocol_003_PsddFKi3_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -332,7 +332,7 @@ (libraries tezos-protocol-003-PsddFKi3 octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index ef6eac1f3e8f..4f70f8a1f391 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-004-Pt24m4xi @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-004-Pt24m4xi diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 232d270fa084..faf6868f41e0 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-004-Pt24m4xi.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_004_Pt24m4xi)) @@ -107,8 +107,8 @@ (public_name tezos-protocol-004-Pt24m4xi) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-004-Pt24m4xi.raw) (flags (:standard) @@ -219,8 +219,8 @@ (public_name tezos-protocol-004-Pt24m4xi.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-004-Pt24m4xi) (flags (:standard) @@ -239,8 +239,8 @@ (library (name tezos_protocol_004_Pt24m4xi_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -332,7 +332,7 @@ (libraries tezos-protocol-004-Pt24m4xi octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index bd126823f9d6..1cd2793108fa 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-005-PsBABY5H.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_005_PsBABY5H)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-005-PsBABY5H) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBABY5H.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-005-PsBABY5H.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBABY5H) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_005_PsBABY5H_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -335,7 +335,7 @@ (libraries tezos-protocol-005-PsBABY5H octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index 00768b6134df..1b39d46cd9ee 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-005-PsBabyM1 @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-005-PsBabyM1 diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index b940c73d7db9..e5b1ed909ce8 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-005-PsBabyM1.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_005_PsBabyM1)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-005-PsBabyM1) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBabyM1.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-005-PsBabyM1.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBabyM1) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_005_PsBabyM1_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -335,7 +335,7 @@ (libraries tezos-protocol-005-PsBabyM1 octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index 9f8c7c4e2041..795c565a7f16 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-006-PsCARTHA octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-006-PsCARTHA @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-006-PsCARTHA - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-006-PsCARTHA diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index 15add6ad00ba..e51893c31193 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-006-PsCARTHA.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_006_PsCARTHA)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-006-PsCARTHA) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-006-PsCARTHA.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-006-PsCARTHA.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-006-PsCARTHA) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_006_PsCARTHA_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -335,7 +335,7 @@ (libraries tezos-protocol-006-PsCARTHA octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 322f065eb1da..a2588955e7ec 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -9,7 +9,7 @@ octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-007-PsDELPH1 @@ -35,7 +35,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-007-PsDELPH1 diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index e69068437c19..b032c7ee84ff 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-007-PsDELPH1.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_007_PsDELPH1)) @@ -110,8 +110,8 @@ (public_name tezos-protocol-007-PsDELPH1) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-007-PsDELPH1.raw) (flags (:standard) @@ -225,8 +225,8 @@ (public_name tezos-protocol-007-PsDELPH1.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-007-PsDELPH1) (flags (:standard) @@ -245,8 +245,8 @@ (library (name tezos_protocol_007_PsDELPH1_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -341,7 +341,7 @@ (libraries tezos-protocol-007-PsDELPH1 octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 0772c8b266ff..a76298f50c06 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -10,7 +10,7 @@ octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-008-PtEdo2Zk @@ -39,7 +39,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-008-PtEdo2Zk diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 323376c0160d..0902f9654533 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-008-PtEdo2Zk.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_008_PtEdo2Zk)) @@ -115,8 +115,8 @@ (public_name tezos-protocol-008-PtEdo2Zk) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdo2Zk.raw) (flags (:standard) @@ -235,8 +235,8 @@ (public_name tezos-protocol-008-PtEdo2Zk.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdo2Zk) (flags (:standard) @@ -255,8 +255,8 @@ (library (name tezos_protocol_008_PtEdo2Zk_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -356,7 +356,7 @@ (libraries tezos-protocol-008-PtEdo2Zk octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 230f809000f2..375b1f55057d 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-008-PtEdoTez.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_008_PtEdoTez)) @@ -115,8 +115,8 @@ (public_name tezos-protocol-008-PtEdoTez) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdoTez.raw) (flags (:standard) @@ -235,8 +235,8 @@ (public_name tezos-protocol-008-PtEdoTez.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdoTez) (flags (:standard) @@ -255,8 +255,8 @@ (library (name tezos_protocol_008_PtEdoTez_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -356,7 +356,7 @@ (libraries tezos-protocol-008-PtEdoTez octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index 068e48fc8540..76137d40bf3f 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -10,7 +10,7 @@ octez-libs.tezos-clic tezos-protocol-009-PsFLoren octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-009-PsFLoren @@ -41,7 +41,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-009-PsFLoren - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-009-PsFLoren diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index 99a329421c77..eea16a3f19a0 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-009-PsFLoren.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_009_PsFLoren)) @@ -118,8 +118,8 @@ (public_name tezos-protocol-009-PsFLoren) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-009-PsFLoren.raw) (flags (:standard) @@ -241,8 +241,8 @@ (public_name tezos-protocol-009-PsFLoren.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-009-PsFLoren) (flags (:standard) @@ -261,8 +261,8 @@ (library (name tezos_protocol_009_PsFLoren_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -365,7 +365,7 @@ (libraries tezos-protocol-009-PsFLoren octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index 023bf2ebb681..84bc8716813c 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -10,7 +10,7 @@ octez-libs.tezos-clic tezos-protocol-010-PtGRANAD octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-010-PtGRANAD @@ -41,7 +41,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-010-PtGRANAD - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-010-PtGRANAD diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index fd9c6cd8894d..66962533be82 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-010-PtGRANAD.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_010_PtGRANAD)) @@ -123,8 +123,8 @@ (public_name tezos-protocol-010-PtGRANAD) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-010-PtGRANAD.raw) (flags (:standard) @@ -251,8 +251,8 @@ (public_name tezos-protocol-010-PtGRANAD.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-010-PtGRANAD) (flags (:standard) @@ -271,8 +271,8 @@ (library (name tezos_protocol_010_PtGRANAD_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -380,7 +380,7 @@ (libraries tezos-protocol-010-PtGRANAD octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index 3971c3f43951..521c2adae238 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -10,7 +10,7 @@ octez-libs.tezos-clic tezos-protocol-011-PtHangz2 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -45,7 +45,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-011-PtHangz2 - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-011-PtHangz2 diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index 99a1e461b50c..dc78d28cc706 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-011-PtHangz2) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 28cc1fc357b1..5f1df2912b35 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-011-PtHangz2.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_011_PtHangz2)) @@ -136,8 +136,8 @@ (public_name tezos-protocol-011-PtHangz2) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2.raw) (flags (:standard) @@ -272,8 +272,8 @@ (public_name tezos-protocol-011-PtHangz2.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2) (flags (:standard) @@ -292,8 +292,8 @@ (library (name tezos_protocol_011_PtHangz2_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -414,7 +414,7 @@ (libraries tezos-protocol-011-PtHangz2 octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index 5d4631b7c632..e665f15f706e 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -10,7 +10,7 @@ octez-libs.tezos-clic tezos-protocol-012-Psithaca octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -45,7 +45,7 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-012-Psithaca - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-012-Psithaca diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 22de2f0fc052..c174ba1c14ec 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-012-Psithaca) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 9bea71d80fe8..d0446c653f74 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-012-Psithaca.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_012_Psithaca)) @@ -153,8 +153,8 @@ (public_name tezos-protocol-012-Psithaca) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-012-Psithaca.raw) (flags (:standard) @@ -306,8 +306,8 @@ (public_name tezos-protocol-012-Psithaca.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-012-Psithaca) (flags (:standard) @@ -326,8 +326,8 @@ (library (name tezos_protocol_012_Psithaca_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -465,7 +465,7 @@ (libraries tezos-protocol-012-Psithaca octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 3be22aeddb0f..dc9699af04a5 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -48,7 +48,7 @@ octez-libs.tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 791a6a5c2888..ae07fac39cc7 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-013-PtJakart) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index ccb11bef50d8..350a98db0061 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-013-PtJakart.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_013_PtJakart)) @@ -218,8 +218,8 @@ (public_name tezos-protocol-013-PtJakart) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-013-PtJakart.raw) (flags (:standard) @@ -437,8 +437,8 @@ (public_name tezos-protocol-013-PtJakart.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-013-PtJakart) (flags (:standard) @@ -457,8 +457,8 @@ (library (name tezos_protocol_013_PtJakart_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -662,7 +662,7 @@ (libraries tezos-protocol-013-PtJakart octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index 63a85c27f2a7..ab549052cc31 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -48,7 +48,7 @@ octez-libs.tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-014-PtKathma diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index f81466eded4b..da92bd7404e9 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-014-PtKathma) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune index 15838f551c9c..13b7569603f6 100644 --- a/src/proto_014_PtKathma/lib_protocol/dune +++ b/src/proto_014_PtKathma/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-014-PtKathma.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_014_PtKathma)) @@ -241,8 +241,8 @@ (public_name tezos-protocol-014-PtKathma) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-014-PtKathma.raw) (flags (:standard) @@ -484,8 +484,8 @@ (public_name tezos-protocol-014-PtKathma.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-014-PtKathma) (flags (:standard) @@ -503,8 +503,8 @@ (library (name tezos_protocol_014_PtKathma_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -732,7 +732,7 @@ (libraries tezos-protocol-014-PtKathma octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune index 7cc2281cd121..b8fcf38eccfa 100644 --- a/src/proto_015_PtLimaPt/lib_client_commands/dune +++ b/src/proto_015_PtLimaPt/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -47,7 +47,7 @@ octez-libs.tezos-clic tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-015-PtLimaPt diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index 218b5d2276aa..b15a3a6a56a3 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-015-PtLimaPt) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_015_PtLimaPt/lib_protocol/dune b/src/proto_015_PtLimaPt/lib_protocol/dune index 890cddd71e5c..1dfdecbcea43 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-015-PtLimaPt.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_015_PtLimaPt)) @@ -265,8 +265,8 @@ (public_name tezos-protocol-015-PtLimaPt) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-015-PtLimaPt.raw) (flags (:standard) @@ -533,8 +533,8 @@ (public_name tezos-protocol-015-PtLimaPt.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-015-PtLimaPt) (flags (:standard) @@ -552,8 +552,8 @@ (library (name tezos_protocol_015_PtLimaPt_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -806,7 +806,7 @@ (libraries tezos-protocol-015-PtLimaPt octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune index 8f60d08d8c4d..20b13f798055 100644 --- a/src/proto_016_PtMumbai/lib_client_commands/dune +++ b/src/proto_016_PtMumbai/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -47,7 +47,7 @@ octez-libs.tezos-clic tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index d86489e6d674..83bb0b228997 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-016-PtMumbai) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_protocol/dune b/src/proto_016_PtMumbai/lib_protocol/dune index 30b579c95da8..02a793965701 100644 --- a/src/proto_016_PtMumbai/lib_protocol/dune +++ b/src/proto_016_PtMumbai/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-016-PtMumbai.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_016_PtMumbai)) @@ -281,8 +281,8 @@ (public_name tezos-protocol-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-016-PtMumbai.raw) (flags (:standard) @@ -567,8 +567,8 @@ (public_name tezos-protocol-016-PtMumbai.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-016-PtMumbai) (flags (:standard) @@ -586,8 +586,8 @@ (library (name tezos_protocol_016_PtMumbai_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -858,7 +858,7 @@ (libraries tezos-protocol-016-PtMumbai octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune index cf8f8af320db..165abfc0fb28 100644 --- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune +++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune @@ -23,7 +23,7 @@ octez-libs.tezos-sapling tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune index ec589ee4ddd1..c180b07ccb39 100644 --- a/src/proto_017_PtNairob/lib_client_commands/dune +++ b/src/proto_017_PtNairob/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -47,7 +47,7 @@ octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index 6d9af8c8c1f7..815bae76079a 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -11,7 +11,7 @@ tezos-version.value tezos-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-017-PtNairob @@ -56,7 +56,7 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-017-PtNairob @@ -85,7 +85,7 @@ (libraries octez-libs.tezos-base tezos-protocol-017-PtNairob - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune index bdc1290e9a0e..b1c3fb782bb2 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-017-PtNairob) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/dune b/src/proto_017_PtNairob/lib_protocol/dune index 2d75dcb4a111..34fc3df80d68 100644 --- a/src/proto_017_PtNairob/lib_protocol/dune +++ b/src/proto_017_PtNairob/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-017-PtNairob.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_017_PtNairob)) @@ -284,8 +284,8 @@ (public_name tezos-protocol-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-017-PtNairob.raw) (flags (:standard) @@ -573,8 +573,8 @@ (public_name tezos-protocol-017-PtNairob.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-017-PtNairob) (flags (:standard) @@ -592,8 +592,8 @@ (library (name tezos_protocol_017_PtNairob_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -867,7 +867,7 @@ (libraries tezos-protocol-017-PtNairob octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune index a840e333d63f..819c724803be 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune @@ -14,7 +14,7 @@ tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-plugin-017-PtNairob octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index 9f43de445fcf..94aaa6429453 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -12,7 +12,7 @@ tezos-client-017-PtNairob octez-shell-libs.tezos-client-base tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-017-PtNairob octez-libs.tezos-test-helpers diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune index b71d21bd8423..200328e3b934 100644 --- a/src/proto_018_Proxford/lib_benchmarks_proto/dune +++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune @@ -23,7 +23,7 @@ octez-libs.tezos-sapling tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune index e645800deeec..6d36d8359145 100644 --- a/src/proto_018_Proxford/lib_client_commands/dune +++ b/src/proto_018_Proxford/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -47,7 +47,7 @@ octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index 1ba4a59df5f5..9758f854351e 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -12,7 +12,7 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted tezos-protocol-plugin-018-Proxford - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-018-Proxford @@ -59,7 +59,7 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-018-Proxford @@ -89,7 +89,7 @@ (libraries octez-libs.tezos-base tezos-protocol-018-Proxford - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune index f452e1bb27a5..3c87ad8197e9 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-018-Proxford) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/dune b/src/proto_018_Proxford/lib_protocol/dune index 7ba1ee91f103..2bdbf3ee5aaa 100644 --- a/src/proto_018_Proxford/lib_protocol/dune +++ b/src/proto_018_Proxford/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-018-Proxford.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_018_Proxford)) @@ -270,8 +270,8 @@ (public_name tezos-protocol-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-018-Proxford.raw) (flags (:standard) @@ -544,8 +544,8 @@ (public_name tezos-protocol-018-Proxford.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-018-Proxford) (flags (:standard) @@ -563,8 +563,8 @@ (library (name tezos_protocol_018_Proxford_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -823,7 +823,7 @@ (libraries tezos-protocol-018-Proxford octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune index a3c726b1e69d..2ffd631e71f5 100644 --- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune +++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune @@ -14,7 +14,7 @@ tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-018-Proxford.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-plugin-018-Proxford octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index 15f68c8912c8..4c25d65234f4 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -12,7 +12,7 @@ tezos-client-018-Proxford octez-shell-libs.tezos-client-base tezos-protocol-018-Proxford.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-018-Proxford octez-libs.tezos-test-helpers diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 4b369c3551ee..64e99fa8e915 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -23,7 +23,7 @@ octez-libs.tezos-sapling tezos-client-alpha tezos-protocol-plugin-alpha - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index f267ec0326d1..3c6ff7e59931 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -11,7 +11,7 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-mockup octez-shell-libs.tezos-mockup-registration @@ -47,7 +47,7 @@ octez-libs.tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-alpha diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 2fdd4bca09ff..a98c5bd6a841 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -12,7 +12,7 @@ tezos-protocol-alpha tezos-protocol-alpha.lifted tezos-protocol-plugin-alpha - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-alpha @@ -59,7 +59,7 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-alpha @@ -89,7 +89,7 @@ (libraries octez-libs.tezos-base tezos-protocol-alpha - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base tezos-client-alpha diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index cd06bb6d21df..557caeb2ae48 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index a6670fce2cde..2d453d22e7d6 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-alpha.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_alpha)) @@ -275,8 +275,8 @@ (public_name tezos-protocol-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-alpha.raw) (flags (:standard) @@ -554,8 +554,8 @@ (public_name tezos-protocol-alpha.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-alpha) (flags (:standard) @@ -573,8 +573,8 @@ (library (name tezos_protocol_alpha_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -838,7 +838,7 @@ (libraries tezos-protocol-alpha octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index 52bd3a40be55..362798adf06b 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -14,7 +14,7 @@ tezos-protocol-alpha tezos-client-alpha tezos-protocol-alpha.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-plugin-alpha octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 482bc2941f56..639cd07320c8 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -12,7 +12,7 @@ tezos-client-alpha octez-shell-libs.tezos-client-base tezos-protocol-alpha.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-alpha octez-libs.tezos-test-helpers diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index 51f66673de01..337dea6ef032 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-demo-counter.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_demo_counter)) @@ -47,8 +47,8 @@ (public_name tezos-protocol-demo-counter) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-counter.raw) (flags (:standard) @@ -94,8 +94,8 @@ (public_name tezos-protocol-demo-counter.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-counter) (flags (:standard) @@ -113,8 +113,8 @@ (library (name tezos_protocol_demo_counter_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -146,7 +146,7 @@ (libraries tezos-protocol-demo-counter octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index b7fee8b1d615..2127225ab5b5 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-demo-noops.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_demo_noops)) @@ -38,8 +38,8 @@ (public_name tezos-protocol-demo-noops) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-noops.raw) (flags (:standard) @@ -75,8 +75,8 @@ (public_name tezos-protocol-demo-noops.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-noops) (flags (:standard) @@ -94,8 +94,8 @@ (library (name tezos_protocol_demo_noops_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -118,7 +118,7 @@ (libraries tezos-protocol-demo-noops octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index 1b6481b14ec3..83b1e3b4fb44 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-shell-libs.tezos-shell-services octez-shell-libs.tezos-client-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-genesis tezos-protocol-genesis.lifted octez-shell-libs.tezos-client-commands diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index c409da3655bf..cb6c21b2aa01 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-genesis.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_genesis)) @@ -38,8 +38,8 @@ (public_name tezos-protocol-genesis) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-genesis.raw) (flags (:standard) @@ -77,8 +77,8 @@ (public_name tezos-protocol-genesis.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-genesis) (flags (:standard) @@ -96,8 +96,8 @@ (library (name tezos_protocol_genesis_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -122,7 +122,7 @@ (libraries tezos-protocol-genesis octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) -- GitLab From 9f83fd27729ae03454ffd7aa1c122dc510d07ecf Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 10 Jul 2023 14:41:09 +0200 Subject: [PATCH 08/13] Manifest: Add libs to octez-l2-libs --- .gitlab/ci/jobs/packaging/opam_package.yml | 63 +++---------------- dune-project | 14 +---- manifest/main.ml | 49 ++++++--------- opam/octez-dac-node.opam | 2 +- opam/octez-dal-node.opam | 2 +- ...s-layer2-store.opam => octez-l2-libs.opam} | 25 +++++--- opam/octez-libs.opam | 2 +- opam/octez-proto-libs.opam | 1 + opam/octez-smart-rollup-client-Proxford.opam | 2 +- opam/octez-smart-rollup-client-PtNairob.opam | 2 +- opam/octez-smart-rollup-client-alpha.opam | 2 +- opam/octez-smart-rollup-node-Proxford.opam | 4 +- opam/octez-smart-rollup-node-PtNairob.opam | 4 +- opam/octez-smart-rollup-node-alpha.opam | 4 +- opam/octez-smart-rollup-node-lib.opam | 3 +- opam/octez-smart-rollup-node.opam | 2 +- opam/octez-smart-rollup-sequencer.opam | 2 +- ...octez-smart-rollup-wasm-benchmark-lib.opam | 24 ------- opam/octez-smart-rollup-wasm-benchmark.opam | 22 ------- opam/octez-smart-rollup-wasm-debugger.opam | 3 +- opam/octez-smart-rollup.opam | 20 ------ opam/octez-wasmer-test.opam | 22 ------- opam/tezos-dac-node-lib.opam | 2 +- opam/tezos-protocol-017-PtNairob-tests.opam | 3 +- opam/tezos-protocol-018-Proxford-tests.opam | 3 +- opam/tezos-protocol-alpha-tests.opam | 3 +- opam/tezos-scoru-wasm-durable-snapshot.opam | 23 ------- opam/tezos-scoru-wasm-fast-test.opam | 28 --------- opam/tezos-scoru-wasm-fast.opam | 21 ------- opam/tezos-scoru-wasm-helpers.opam | 24 ------- opam/tezos-scoru-wasm-regressions.opam | 2 +- opam/tezos-scoru-wasm-test-helpers.opam | 28 --------- opam/tezos-scoru-wasm-test.opam | 28 --------- ...ezos-smart-rollup-layer2-016-PtMumbai.opam | 2 +- ...ezos-smart-rollup-layer2-017-PtNairob.opam | 2 +- ...ezos-smart-rollup-layer2-018-Proxford.opam | 2 +- opam/tezos-smart-rollup-layer2-alpha.opam | 2 +- opam/tezos-tree-encoding-test.opam | 1 + opam/tezos-wasmer.opam | 27 -------- opam/tezos-webassembly-interpreter-extra.opam | 21 ------- src/bin_dac_node/dune | 2 +- src/bin_dal_node/dune | 2 +- src/bin_smart_rollup_node/dune | 2 +- src/bin_wasm_debugger/dune | 8 +-- src/lib_base/index.mld | 2 - src/lib_dac_node/dune | 2 +- src/lib_layer2_store/dune | 2 +- src/lib_layer2_store/test/dune | 4 +- src/lib_protocol_environment/dune | 2 +- src/lib_protocol_environment/structs/dune | 2 +- src/lib_scoru_sequencer/dune | 2 +- src/lib_scoru_wasm/bench/dune | 8 +-- src/lib_scoru_wasm/bench/executable/dune | 2 +- src/lib_scoru_wasm/dune | 4 +- src/lib_scoru_wasm/fast/dune | 8 +-- src/lib_scoru_wasm/fast/test/dune | 10 +-- src/lib_scoru_wasm/helpers/dune | 8 +-- src/lib_scoru_wasm/regressions/dune | 4 +- src/lib_scoru_wasm/test/dune | 10 +-- src/lib_scoru_wasm/test/durable_snapshot/dune | 4 +- src/lib_scoru_wasm/test/helpers/dune | 12 ++-- src/lib_smart_rollup/dune | 4 +- src/lib_smart_rollup/index.mld | 11 ++++ src/lib_smart_rollup_node/dune | 4 +- src/lib_tree_encoding/test/dune | 2 +- src/lib_wasmer/dune | 2 +- src/lib_wasmer/test/dune | 4 +- src/lib_webassembly/bin/dune | 4 +- src/lib_webassembly/dune | 2 +- src/lib_webassembly/extra/dune | 4 +- src/lib_webassembly/tests/dune | 4 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_protocol/test/unit/dune | 6 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 8 +-- .../lib_protocol/test/unit/dune | 6 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 8 +-- src/proto_alpha/lib_protocol/test/unit/dune | 6 +- src/proto_alpha/lib_sc_rollup_client/dune | 2 +- src/proto_alpha/lib_sc_rollup_layer2/dune | 2 +- src/proto_alpha/lib_sc_rollup_node/dune | 8 +-- 84 files changed, 174 insertions(+), 519 deletions(-) rename opam/{tezos-layer2-store.opam => octez-l2-libs.opam} (59%) delete mode 100644 opam/octez-smart-rollup-wasm-benchmark-lib.opam delete mode 100644 opam/octez-smart-rollup-wasm-benchmark.opam delete mode 100644 opam/octez-smart-rollup.opam delete mode 100644 opam/octez-wasmer-test.opam delete mode 100644 opam/tezos-scoru-wasm-durable-snapshot.opam delete mode 100644 opam/tezos-scoru-wasm-fast-test.opam delete mode 100644 opam/tezos-scoru-wasm-fast.opam delete mode 100644 opam/tezos-scoru-wasm-helpers.opam delete mode 100644 opam/tezos-scoru-wasm-test-helpers.opam delete mode 100644 opam/tezos-scoru-wasm-test.opam delete mode 100644 opam/tezos-wasmer.opam delete mode 100644 opam/tezos-webassembly-interpreter-extra.opam diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index ffc08e53e363..9bedd41742f3 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -528,6 +528,13 @@ opam:octez-injector: variables: package: octez-injector +opam:octez-l2-libs: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: octez-l2-libs + opam:octez-libs: extends: - .opam_template @@ -586,13 +593,6 @@ opam:octez-signer: variables: package: octez-signer -opam:octez-smart-rollup: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-smart-rollup - opam:octez-smart-rollup-client-Proxford: extends: - .opam_template @@ -638,10 +638,6 @@ opam:octez-smart-rollup-node-lib: # Ignoring unreleased package octez-smart-rollup-sequencer-node. -# Ignoring unreleased package octez-smart-rollup-wasm-benchmark. - -# Ignoring unreleased package octez-smart-rollup-wasm-benchmark-lib. - opam:octez-smart-rollup-wasm-debugger: extends: - .opam_template @@ -655,8 +651,6 @@ opam:octez-smart-rollup-wasm-debugger: # Ignoring unreleased package octez-testnet-scenarios. -# Ignoring unreleased package octez-wasmer-test. - # Ignoring unreleased package octogram. # Ignoring unreleased package scoru-sequencer-test. @@ -1148,13 +1142,6 @@ opam:tezos-embedded-protocol-genesis: variables: package: tezos-embedded-protocol-genesis -opam:tezos-layer2-store: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-layer2-store - # Ignoring unreleased package tezos-layer2-utils-016-PtMumbai. opam:tezos-layer2-utils-017-PtNairob: @@ -1557,30 +1544,8 @@ opam:tezos-proxy-server-config: # Ignoring unreleased package tezos-sc-rollup-node-test. -# Ignoring unreleased package tezos-scoru-wasm-durable-snapshot. - -opam:tezos-scoru-wasm-fast: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-scoru-wasm-fast - -# Ignoring unreleased package tezos-scoru-wasm-fast-test. - -opam:tezos-scoru-wasm-helpers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-scoru-wasm-helpers - # Ignoring unreleased package tezos-scoru-wasm-regressions. -# Ignoring unreleased package tezos-scoru-wasm-test. - -# Ignoring unreleased package tezos-scoru-wasm-test-helpers. - opam:tezos-smart-rollup-016-PtMumbai: extends: - .opam_template @@ -1640,18 +1605,4 @@ opam:tezos-version: variables: package: tezos-version -opam:tezos-wasmer: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-wasmer - -opam:tezos-webassembly-interpreter-extra: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-webassembly-interpreter-extra - # Ignoring unreleased package tezt-ethereum. diff --git a/dune-project b/dune-project index 178a87c51d8e..128f31b55b91 100644 --- a/dune-project +++ b/dune-project @@ -25,6 +25,7 @@ (package (name octez-evm-proxy-lib-prod)(allow_empty)) (package (name octez-evm-proxy-tests)(allow_empty)) (package (name octez-injector)) +(package (name octez-l2-libs)) (package (name octez-libs)) (package (name octez-node)) (package (name octez-node-config)) @@ -34,7 +35,6 @@ (package (name octez-shell-libs)) (package (name octez-shell-tests)(allow_empty)) (package (name octez-signer)) -(package (name octez-smart-rollup)) (package (name octez-smart-rollup-client-Proxford)) (package (name octez-smart-rollup-client-PtNairob)) (package (name octez-smart-rollup-client-alpha)) @@ -45,13 +45,10 @@ (package (name octez-smart-rollup-node-lib)) (package (name octez-smart-rollup-sequencer)(allow_empty)) (package (name octez-smart-rollup-sequencer-node)) -(package (name octez-smart-rollup-wasm-benchmark)(allow_empty)) -(package (name octez-smart-rollup-wasm-benchmark-lib)(allow_empty)) (package (name octez-smart-rollup-wasm-debugger)) (package (name octez-snoop)) (package (name octez-store-tests)(allow_empty)) (package (name octez-testnet-scenarios)) -(package (name octez-wasmer-test)(allow_empty)) (package (name octogram)) (package (name scoru-sequencer-test)(allow_empty)) (package (name tezos-017-PtNairob-test-helpers)) @@ -135,7 +132,6 @@ (package (name tezos-embedded-protocol-demo-counter)) (package (name tezos-embedded-protocol-demo-noops)) (package (name tezos-embedded-protocol-genesis)) -(package (name tezos-layer2-store)(allow_empty)) (package (name tezos-layer2-utils-016-PtMumbai)) (package (name tezos-layer2-utils-017-PtNairob)) (package (name tezos-layer2-utils-018-Proxford)) @@ -202,13 +198,7 @@ (package (name tezos-protocol-plugin-alpha-tests)(allow_empty)) (package (name tezos-proxy-server-config)) (package (name tezos-sc-rollup-node-test)(allow_empty)) -(package (name tezos-scoru-wasm-durable-snapshot)(allow_empty)) -(package (name tezos-scoru-wasm-fast)) -(package (name tezos-scoru-wasm-fast-test)(allow_empty)) -(package (name tezos-scoru-wasm-helpers)) (package (name tezos-scoru-wasm-regressions)(allow_empty)) -(package (name tezos-scoru-wasm-test)(allow_empty)) -(package (name tezos-scoru-wasm-test-helpers)(allow_empty)) (package (name tezos-smart-rollup-016-PtMumbai)) (package (name tezos-smart-rollup-017-PtNairob)) (package (name tezos-smart-rollup-018-Proxford)) @@ -221,8 +211,6 @@ (package (name tezos-tps-evaluation)) (package (name tezos-tree-encoding-test)(allow_empty)) (package (name tezos-version)) -(package (name tezos-wasmer)) -(package (name tezos-webassembly-interpreter-extra)) (package (name tezt-ethereum)(allow_empty)) ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. diff --git a/manifest/main.ml b/manifest/main.ml index fd2bdc903426..ceb095464bcf 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -492,7 +492,7 @@ let octez_proto_lib : Sub_lib.maker = (* Registers a sub-library in the [octez-l2-libs] package. This package should contain all the libraries related to layer 2. *) -let _octez_l2_lib : Sub_lib.maker = +let octez_l2_lib : Sub_lib.maker = Sub_lib.sub_lib ~package_synopsis:"Octez layer2 libraries" ~container:registered_octez_l2_libs @@ -2026,7 +2026,6 @@ let octez_base = Should be in sync with scripts/version.sh *) at_least "4.14.1" && less_than "4.15") ~license:"Apache-2.0" - ~extra_authors:["WebAssembly Authors"] let octez_base_unix = octez_lib @@ -2167,7 +2166,7 @@ let _lazy_containers_tests = ] let octez_webassembly_interpreter = - octez_lib + octez_l2_lib "tezos-webassembly-interpreter" ~path:"src/lib_webassembly" ~dune:Dune.[[S "include_subdirs"; S "unqualified"]] @@ -2182,7 +2181,7 @@ let octez_webassembly_interpreter = ~preprocess:[pps ppx_deriving_show] let octez_webassembly_interpreter_extra = - public_lib + octez_l2_lib "tezos-webassembly-interpreter-extra" ~path:"src/lib_webassembly/extra" ~license:"Apache-2.0" @@ -2216,7 +2215,7 @@ let _octez_webassembly_test = tezt ["smallint"] ~path:"src/lib_webassembly/tests" - ~opam:"octez-libs" + ~opam:"octez-l2-libs" ~dune:Dune.[[S "include_subdirs"; S "no"]] ~deps:[octez_webassembly_interpreter |> open_; alcotezt] @@ -2578,7 +2577,7 @@ let _octez_gossipsub_test = ] let octez_wasmer = - public_lib + octez_l2_lib "tezos-wasmer" ~path:"src/lib_wasmer" ~synopsis:"Wasmer bindings for SCORU WASM" @@ -2604,8 +2603,7 @@ let _octez_wasmer_test = tezt ["test_wasmer"] ~path:"src/lib_wasmer/test" - ~opam:"octez-wasmer-test" - ~synopsis:"Tests for the Wasmer bindings" + ~opam:"octez-l2-libs" ~deps:[octez_wasmer; alcotezt] let octez_context_encoding = @@ -2654,7 +2652,7 @@ let octez_context_memory = ~conflicts:[Conflicts.checkseum] let octez_scoru_wasm = - octez_lib + octez_l2_lib "tezos-scoru-wasm" ~path:"src/lib_scoru_wasm" ~deps: @@ -2670,7 +2668,7 @@ let octez_scoru_wasm = ] let octez_scoru_wasm_fast = - public_lib + octez_l2_lib "tezos-scoru-wasm-fast" ~path:"src/lib_scoru_wasm/fast" ~synopsis:"WASM functionality for SCORU Fast Execution" @@ -4117,10 +4115,9 @@ let _octez_embedded_protocol_packer = ~modules:["Main_embedded_packer"] let octez_layer2_store = - private_lib + octez_l2_lib "tezos_layer2_store" ~path:"src/lib_layer2_store" - ~opam:"tezos-layer2-store" ~synopsis:"Tezos: layer2 storage utils" ~deps: [ @@ -4140,7 +4137,7 @@ let _octez_layer2_indexed_store_test = tezt ["test_indexed_store"] ~path:"src/lib_layer2_store/test/" - ~opam:"tezos-layer2-store" + ~opam:"octez-l2-libs" ~deps: [ octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; @@ -4331,10 +4328,11 @@ let octez_injector = ] let octez_smart_rollup_lib = - public_lib + octez_l2_lib "octez-smart-rollup" ~path:"src/lib_smart_rollup" - ~synopsis:"Octez: library for Smart Rollups " + ~synopsis:"Octez: library for Smart Rollups" + ~documentation:[Dune.[S "package"; S "octez-l2-libs"]] ~deps: [ octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -4373,10 +4371,9 @@ let octez_smart_rollup_node_lib = ] let octez_scoru_wasm_helpers = - public_lib + octez_l2_lib "tezos-scoru-wasm-helpers" ~path:"src/lib_scoru_wasm/helpers" - ~opam:"tezos-scoru-wasm-helpers" ~synopsis:"Helpers for the smart rollup wasm functionality and debugger" ~deps: [ @@ -4391,10 +4388,9 @@ let octez_scoru_wasm_helpers = ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] let octez_scoru_wasm_durable_snapshot = - private_lib + octez_l2_lib "tezos_scoru_wasm_durable_snapshot" ~path:"src/lib_scoru_wasm/test/durable_snapshot" - ~opam:"tezos-scoru-wasm-durable-snapshot" ~synopsis:"Durable storage reference implementation" ~deps: [ @@ -4405,10 +4401,9 @@ let octez_scoru_wasm_durable_snapshot = ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] let octez_scoru_wasm_tests_helpers = - private_lib + octez_l2_lib "tezos_scoru_wasm_test_helpers" ~path:"src/lib_scoru_wasm/test/helpers" - ~opam:"tezos-scoru-wasm-test-helpers" ~synopsis:"Helpers for test of the smart rollup wasm functionality" ~deps: [ @@ -4429,11 +4424,10 @@ let octez_scoru_wasm_tests_helpers = ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] let octez_scoru_wasm_benchmark = - private_lib + octez_l2_lib "octez_smart_rollup_wasm_benchmark_lib" ~path:"src/lib_scoru_wasm/bench" ~synopsis:"Smart Rollup WASM benchmark library" - ~opam:"octez-smart-rollup-wasm-benchmark-lib" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -4450,8 +4444,7 @@ let _octez_scoru_wasm_benchmark_exe = private_exe "octez_smart_rollup_wasm_benchmark" ~path:"src/lib_scoru_wasm/bench/executable" - ~synopsis:"Smart rollup WASM benchmark library" - ~opam:"octez-smart-rollup-wasm-benchmark" + ~opam:"octez-l2-libs" ~preprocess:[pps ppx_deriving_show] ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_scoru_wasm_benchmark] @@ -4481,8 +4474,7 @@ let _octez_scoru_wasm_tests = "test_wasm_vm"; ] ~path:"src/lib_scoru_wasm/test" - ~opam:"tezos-scoru-wasm-test" - ~synopsis:"Tests for the scoru-wasm functionality" + ~opam:"octez-l2-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -4511,8 +4503,7 @@ let _octez_scoru_wasm_fast_tests = "test_memory_access"; ] ~path:"src/lib_scoru_wasm/fast/test" - ~opam:"tezos-scoru-wasm-fast-test" - ~synopsis:"Tests for the scoru-wasm-fast functionality" + ~opam:"octez-l2-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index 147136c3b1d1..5d77eed9f55c 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -14,7 +14,7 @@ depends: [ "octez-shell-libs" "tezos-dac-lib" "tezos-dac-node-lib" - "tezos-layer2-store" + "octez-l2-libs" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "tezos-dac-017-PtNairob" diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 208cef65c47e..01c2ccb9be38 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -15,7 +15,7 @@ depends: [ "octez-shell-libs" "tezos-dal-node-lib" "tezos-dal-node-services" - "tezos-layer2-store" + "octez-l2-libs" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "prometheus-app" { >= "1.2" } diff --git a/opam/tezos-layer2-store.opam b/opam/octez-l2-libs.opam similarity index 59% rename from opam/tezos-layer2-store.opam rename to opam/octez-l2-libs.opam index 419ee345eb6a..57dca010796c 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/octez-l2-libs.opam @@ -2,22 +2,33 @@ # Edit file manifest/main.ml instead. opam-version: "2.0" maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] +authors: ["Tezos devteam" "WebAssembly Authors"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" +license: "Apache-2.0" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "index" { >= "1.6.0" & < "1.7.0" } + "ppx_deriving" "octez-libs" + "zarith" { >= "1.12" & < "1.13" } + "lwt" { >= "5.7.0" } + "ctypes" { >= "0.18.0" } + "ctypes-foreign" { >= "0.18.0" } + "tezos-rust-libs" { = "1.6" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "aches-lwt" { >= "1.0.0" } - "tezt" { with-test & >= "3.1.1" } - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} + "ppx_import" + "qcheck-alcotest" { >= "0.20" } + "octez-alcotezt" + "tezt" { >= "3.1.1" } +] +x-opam-monorepo-opam-provided: [ + "tezos-rust-libs" ] conflicts: [ "checkseum" { = "0.5.0" } @@ -27,4 +38,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos: layer2 storage utils" +synopsis: "Octez layer2 libraries" diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 73271b0b55b7..5c710957cb37 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -2,7 +2,7 @@ # Edit file manifest/main.ml instead. opam-version: "2.0" maintainer: "contact@tezos.com" -authors: ["Tezos devteam" "WebAssembly Authors"] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" diff --git a/opam/octez-proto-libs.opam b/opam/octez-proto-libs.opam index d621e3217c81..df8979b82525 100644 --- a/opam/octez-proto-libs.opam +++ b/opam/octez-proto-libs.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" + "octez-l2-libs" "data-encoding" { >= "0.7.1" & < "1.0.0" } "bls12-381" "zarith" { >= "1.12" & < "1.13" } diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam index 5ff313e07430..75a82d02d66c 100644 --- a/opam/octez-smart-rollup-client-Proxford.opam +++ b/opam/octez-smart-rollup-client-Proxford.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-018-Proxford" "octez-shell-libs" "tezos-client-018-Proxford" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-018-Proxford" "tezos-smart-rollup-layer2-018-Proxford" "tezos-version" diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index 9f1d2c5ff759..663882fbfca2 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-017-PtNairob" "octez-shell-libs" "tezos-client-017-PtNairob" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-017-PtNairob" "tezos-smart-rollup-layer2-017-PtNairob" "tezos-version" diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index 0782432d52a6..2435ef1a0809 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-alpha" "octez-shell-libs" "tezos-client-alpha" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-alpha" "tezos-smart-rollup-layer2-alpha" "tezos-version" diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam index ccc3d4e64653..788e9d17bc85 100644 --- a/opam/octez-smart-rollup-node-Proxford.opam +++ b/opam/octez-smart-rollup-node-Proxford.opam @@ -20,11 +20,10 @@ depends: [ "tezos-dac-018-Proxford" "tezos-dac-lib" "tezos-dac-client-lib" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-018-Proxford" "tezos-smart-rollup-layer2-018-Proxford" "tezos-layer2-utils-018-Proxford" - "tezos-layer2-store" "octez-crawler" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -33,7 +32,6 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm-fast" "tezos-version" ] conflicts: [ diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index 755921ae446b..001808105177 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -18,11 +18,10 @@ depends: [ "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-dac-lib" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-017-PtNairob" "tezos-smart-rollup-layer2-017-PtNairob" "tezos-layer2-utils-017-PtNairob" - "tezos-layer2-store" "octez-crawler" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -31,7 +30,6 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm-fast" "tezos-version" ] conflicts: [ diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 9dc86d46b097..5ed5a52907fd 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -20,11 +20,10 @@ depends: [ "tezos-dac-alpha" "tezos-dac-lib" "tezos-dac-client-lib" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-alpha" "tezos-smart-rollup-layer2-alpha" "tezos-layer2-utils-alpha" - "tezos-layer2-store" "octez-crawler" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -33,7 +32,6 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm-fast" "tezos-version" ] conflicts: [ diff --git a/opam/octez-smart-rollup-node-lib.opam b/opam/octez-smart-rollup-node-lib.opam index 8005adceeab7..9a263935f284 100644 --- a/opam/octez-smart-rollup-node-lib.opam +++ b/opam/octez-smart-rollup-node-lib.opam @@ -20,9 +20,8 @@ depends: [ "tezos-dac-client-lib" "octez-injector" "tezos-version" - "tezos-layer2-store" + "octez-l2-libs" "octez-crawler" - "octez-smart-rollup" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam index fb25f031c486..a3a4bf314eb9 100644 --- a/opam/octez-smart-rollup-node.opam +++ b/opam/octez-smart-rollup-node.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "octez-shell-libs" - "octez-smart-rollup" + "octez-l2-libs" "octez-smart-rollup-node-lib" "octez-smart-rollup-node-PtNairob" "octez-smart-rollup-node-Proxford" diff --git a/opam/octez-smart-rollup-sequencer.opam b/opam/octez-smart-rollup-sequencer.opam index 9b3d8da6808e..5ff3fafc113c 100644 --- a/opam/octez-smart-rollup-sequencer.opam +++ b/opam/octez-smart-rollup-sequencer.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-alpha" "octez-smart-rollup-node-alpha" "octez-smart-rollup-node-lib" - "octez-smart-rollup" + "octez-l2-libs" "octez-shell-libs" ] build: [ diff --git a/opam/octez-smart-rollup-wasm-benchmark-lib.opam b/opam/octez-smart-rollup-wasm-benchmark-lib.opam deleted file mode 100644 index ebf3b5a2e2e0..000000000000 --- a/opam/octez-smart-rollup-wasm-benchmark-lib.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_deriving" - "octez-libs" - "tezt" { >= "3.1.1" } - "tezos-scoru-wasm-helpers" - "lwt" { >= "5.7.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Smart Rollup WASM benchmark library" diff --git a/opam/octez-smart-rollup-wasm-benchmark.opam b/opam/octez-smart-rollup-wasm-benchmark.opam deleted file mode 100644 index d1dbcad705db..000000000000 --- a/opam/octez-smart-rollup-wasm-benchmark.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_deriving" - "octez-libs" - "octez-smart-rollup-wasm-benchmark-lib" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Smart rollup WASM benchmark library" diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index 8a1aab191378..3dce96c0f7da 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -13,8 +13,7 @@ depends: [ "octez-libs" "yaml" { >= "3.1.0" } "tezos-client-alpha" - "tezos-scoru-wasm-helpers" - "tezos-webassembly-interpreter-extra" + "octez-l2-libs" "tezos-version" ] build: [ diff --git a/opam/octez-smart-rollup.opam b/opam/octez-smart-rollup.opam deleted file mode 100644 index 5742940456cd..000000000000 --- a/opam/octez-smart-rollup.opam +++ /dev/null @@ -1,20 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Octez: library for Smart Rollups " diff --git a/opam/octez-wasmer-test.opam b/opam/octez-wasmer-test.opam deleted file mode 100644 index 72df2c94421b..000000000000 --- a/opam/octez-wasmer-test.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } - "tezos-wasmer" {with-test} - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tests for the Wasmer bindings" diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index 12444a65064e..c48ff187dc51 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "octez-shell-libs" - "tezos-layer2-store" + "octez-l2-libs" "tezos-dac-lib" "tezos-dac-client-lib" ] diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 83dd7cbfc157..b364f5ece482 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -24,8 +24,7 @@ depends: [ "tezos-smart-rollup-017-PtNairob" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} + "octez-l2-libs" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 66ff32ce9bad..5b5f9b099049 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -24,8 +24,7 @@ depends: [ "tezos-smart-rollup-018-Proxford" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} + "octez-l2-libs" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index dc9844d0069c..528716caf779 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -24,8 +24,7 @@ depends: [ "tezos-smart-rollup-alpha" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} + "octez-l2-libs" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-scoru-wasm-durable-snapshot.opam b/opam/tezos-scoru-wasm-durable-snapshot.opam deleted file mode 100644 index 28b3be58b1b7..000000000000 --- a/opam/tezos-scoru-wasm-durable-snapshot.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" - "ppx_deriving" - "octez-libs" - "tezos-webassembly-interpreter-extra" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Durable storage reference implementation" diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/tezos-scoru-wasm-fast-test.opam deleted file mode 100644 index f714b1abb974..000000000000 --- a/opam/tezos-scoru-wasm-fast-test.opam +++ /dev/null @@ -1,28 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" {with-test} - "ppx_deriving" {with-test} - "tezt" { with-test & >= "3.1.1" } - "octez-libs" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm-test-helpers" {with-test} - "tezos-scoru-wasm-fast" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tests for the scoru-wasm-fast functionality" diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam deleted file mode 100644 index 17d63fc0e0dd..000000000000 --- a/opam/tezos-scoru-wasm-fast.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-wasmer" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "WASM functionality for SCORU Fast Execution" diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam deleted file mode 100644 index 6059fdc2fd6f..000000000000 --- a/opam/tezos-scoru-wasm-helpers.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" - "ppx_deriving" - "octez-libs" - "tezos-scoru-wasm-fast" - "tezos-webassembly-interpreter-extra" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Helpers for the smart rollup wasm functionality and debugger" diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index e1728ce4fab7..8cec8eed635d 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -13,7 +13,7 @@ depends: [ "ppx_import" "ppx_deriving" "octez-libs" - "tezos-scoru-wasm-helpers" + "octez-l2-libs" "tezos-protocol-alpha" "tezos-smart-rollup-alpha" "tezt" { >= "3.1.1" } diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam deleted file mode 100644 index 998ad2c413d7..000000000000 --- a/opam/tezos-scoru-wasm-test-helpers.opam +++ /dev/null @@ -1,28 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" - "ppx_deriving" - "octez-libs" - "tezos-scoru-wasm-durable-snapshot" - "tezos-scoru-wasm-fast" - "tezos-scoru-wasm-helpers" - "qcheck-alcotest" { >= "0.20" } - "octez-alcotezt" - "tezos-webassembly-interpreter-extra" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Helpers for test of the smart rollup wasm functionality" diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam deleted file mode 100644 index 46782c183c2e..000000000000 --- a/opam/tezos-scoru-wasm-test.opam +++ /dev/null @@ -1,28 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" {with-test} - "ppx_deriving" {with-test} - "tezt" { with-test & >= "3.1.1" } - "octez-libs" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm-test-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tests for the scoru-wasm functionality" diff --git a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam index f10680f08a6a..11af261c8103 100644 --- a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-016-PtMumbai" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam index 970980cff472..4001b4a7e9c2 100644 --- a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam +++ b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-layer2-018-Proxford.opam b/opam/tezos-smart-rollup-layer2-018-Proxford.opam index 4fcdee20560e..a3a2b43bb5e2 100644 --- a/opam/tezos-smart-rollup-layer2-018-Proxford.opam +++ b/opam/tezos-smart-rollup-layer2-018-Proxford.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-layer2-alpha.opam b/opam/tezos-smart-rollup-layer2-alpha.opam index 45f54b6ad5ef..b213d6ed2c5d 100644 --- a/opam/tezos-smart-rollup-layer2-alpha.opam +++ b/opam/tezos-smart-rollup-layer2-alpha.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 0c3bd20034a8..69e25b3dbb48 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -12,6 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} + "octez-l2-libs" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-wasmer.opam b/opam/tezos-wasmer.opam deleted file mode 100644 index f372d3e0dde8..000000000000 --- a/opam/tezos-wasmer.opam +++ /dev/null @@ -1,27 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_deriving" - "ctypes" { >= "0.18.0" } - "ctypes-foreign" { >= "0.18.0" } - "lwt" { >= "5.7.0" } - "tezos-rust-libs" { = "1.6" } -] -x-opam-monorepo-opam-provided: [ - "tezos-rust-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Wasmer bindings for SCORU WASM" diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam deleted file mode 100644 index e9256a7103eb..000000000000 --- a/opam/tezos-webassembly-interpreter-extra.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam" "WebAssembly Authors"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "Apache-2.0" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "lwt" { >= "5.7.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Additional modules from the WebAssembly REPL used in testing" diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index 4a1c5d7cc39c..05857d0ddc1c 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -21,7 +21,7 @@ octez-libs.tezos-stdlib tezos-dac-lib tezos_dac_node_lib - tezos_layer2_store + octez-l2-libs.tezos_layer2_store irmin-pack irmin-pack.unix irmin diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 9e4736dafb5f..514c301629d9 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -22,7 +22,7 @@ octez-libs.tezos-stdlib tezos-dal-node-lib tezos-dal-node-services - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-libs.tezos-crypto-dal octez-shell-libs.tezos-store.unix octez-shell-libs.tezos-store.shared diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune index ac0ca1e1d564..f6ce017e7676 100644 --- a/src/bin_smart_rollup_node/dune +++ b/src/bin_smart_rollup_node/dune @@ -13,7 +13,7 @@ octez-shell-libs.tezos-client-base octez-shell-libs.tezos-client-base-unix octez-shell-libs.tezos-client-commands - octez-smart-rollup + octez-l2-libs.octez-smart-rollup octez-smart-rollup-node-lib octez_smart_rollup_node_PtNairob octez_smart_rollup_node_Proxford diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index 5aa938099433..d23198b63ba7 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -13,10 +13,10 @@ octez-libs.tezos-base.unix yaml tezos-client-alpha - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-helpers - octez-libs.tezos-webassembly-interpreter - tezos-webassembly-interpreter-extra + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-helpers + octez-l2-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter-extra tezos-version.value) (link_flags (:standard) diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index 2d2bce730d39..41c674b8fcee 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -46,13 +46,11 @@ It contains the following libraries: - {{!module-Tezos_rpc_http_client_unix}Tezos_rpc_http_client_unix}: Unix implementation of the RPC client - {{!module-Tezos_rpc_http_server}Tezos_rpc_http_server}: Library of auto-documented RPCs (http server) - {{!module-Tezos_sapling}Tezos_sapling} -- {{!module-Tezos_scoru_wasm}Tezos_scoru_wasm} - {{!module-Tezos_stdlib}Tezos_stdlib}: Yet-another local-extension of the OCaml standard library - {{!module-Tezos_stdlib_unix}Tezos_stdlib_unix}: Yet-another local-extension of the OCaml standard library (unix-specific fragment) - {{!module-Tezos_test_helpers}Tezos_test_helpers} - {{!module-Tezos_tree_encoding}Tezos_tree_encoding}: A general-purpose library to encode arbitrary data in Merkle trees - {{!module-Tezos_version}Tezos_version}: Version information generated from Git -- {{!module-Tezos_webassembly_interpreter}Tezos_webassembly_interpreter} - {{!page-tezos_workers}Tezos_workers}: Worker library - {{!module-Tezt_performance_regression}Tezt_performance_regression} - {{!module-Tezt_tezos}Tezt_tezos}: Octez test framework based on Tezt diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index 8a41ca3a4690..c0ad4fd20e19 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -11,7 +11,7 @@ octez-shell-libs.tezos-client-base octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-libs.tezos-rpc-http-server tezos-dac-lib tezos-dac-client-lib) diff --git a/src/lib_layer2_store/dune b/src/lib_layer2_store/dune index 95d8164c46cb..027f78779619 100644 --- a/src/lib_layer2_store/dune +++ b/src/lib_layer2_store/dune @@ -3,7 +3,7 @@ (library (name tezos_layer2_store) - (package tezos-layer2-store) + (public_name octez-l2-libs.tezos_layer2_store) (instrumentation (backend bisect_ppx)) (libraries index diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune index a43ba892b7f9..bf890e1fb08d 100644 --- a/src/lib_layer2_store/test/dune +++ b/src/lib_layer2_store/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-error-monad - tezos_layer2_store + octez-l2-libs.tezos_layer2_store qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -31,7 +31,7 @@ (rule (alias runtest) - (package tezos-layer2-store) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index c682b11b3915..ec919b29eab6 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -20,7 +20,7 @@ octez-proto-libs.tezos-protocol-environment.structs octez-libs.tezos-micheline octez-libs.tezos-context.memory - octez-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm octez-libs.tezos-event-logging) (flags (:standard) diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 705540059c4b..468fb882e9af 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -9,7 +9,7 @@ octez-libs.tezos-stdlib octez-libs.tezos-crypto octez-libs.tezos-lwt-result-stdlib - octez-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm data-encoding bls12-381 octez-libs.octez-plonk) diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune index ebf1f3e24175..0917fad7b604 100644 --- a/src/lib_scoru_sequencer/dune +++ b/src/lib_scoru_sequencer/dune @@ -12,7 +12,7 @@ octez_smart_rollup_node_alpha octez-libs.tezos-workers octez-smart-rollup-node-lib - octez-smart-rollup + octez-l2-libs.octez-smart-rollup octez-shell-libs.tezos-client-base octez-libs.tezos-rpc octez-libs.tezos-rpc-http diff --git a/src/lib_scoru_wasm/bench/dune b/src/lib_scoru_wasm/bench/dune index 78345b950854..9deadce80ec4 100644 --- a/src/lib_scoru_wasm/bench/dune +++ b/src/lib_scoru_wasm/bench/dune @@ -3,15 +3,15 @@ (library (name octez_smart_rollup_wasm_benchmark_lib) - (package octez-smart-rollup-wasm-benchmark-lib) + (public_name octez-l2-libs.octez_smart_rollup_wasm_benchmark_lib) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base tezt - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-libs.tezos-context.memory - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-helpers lwt.unix) (preprocess (pps ppx_deriving.show)) (flags diff --git a/src/lib_scoru_wasm/bench/executable/dune b/src/lib_scoru_wasm/bench/executable/dune index c3fa84e97fc4..ead2af7dcd2b 100644 --- a/src/lib_scoru_wasm/bench/executable/dune +++ b/src/lib_scoru_wasm/bench/executable/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez_smart_rollup_wasm_benchmark_lib) + octez-l2-libs.octez_smart_rollup_wasm_benchmark_lib) (preprocess (pps ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index 2ec4ab313641..2330b131dc9e 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -3,13 +3,13 @@ (library (name tezos_scoru_wasm) - (public_name octez-libs.tezos-scoru-wasm) + (public_name octez-l2-libs.tezos-scoru-wasm) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding octez-libs.tezos-lazy-containers - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-libs.tezos-context.sigs octez-libs.tezos-context.memory octez-libs.tezos-lwt-result-stdlib diff --git a/src/lib_scoru_wasm/fast/dune b/src/lib_scoru_wasm/fast/dune index 7bea795e8d86..1e355d8479a5 100644 --- a/src/lib_scoru_wasm/fast/dune +++ b/src/lib_scoru_wasm/fast/dune @@ -3,15 +3,15 @@ (library (name tezos_scoru_wasm_fast) - (public_name tezos-scoru-wasm-fast) + (public_name octez-l2-libs.tezos-scoru-wasm-fast) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-libs.tezos-lazy-containers - octez-libs.tezos-scoru-wasm - tezos-wasmer) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-wasmer) (flags (:standard) -open Tezos_base.TzPervasives)) diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune index ecc2fe9d0361..bb6cbe07d79e 100644 --- a/src/lib_scoru_wasm/fast/test/dune +++ b/src/lib_scoru_wasm/fast/test/dune @@ -11,11 +11,11 @@ octez-libs.tezos-base.unix octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers - tezos-scoru-wasm-helpers - tezos_scoru_wasm_test_helpers + octez-l2-libs.tezos-scoru-wasm-helpers + octez-l2-libs.tezos_scoru_wasm_test_helpers octez-libs.tezos-test-helpers - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -48,7 +48,7 @@ (rule (alias runtest) - (package tezos-scoru-wasm-fast-test) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_scoru_wasm/helpers/dune b/src/lib_scoru_wasm/helpers/dune index 350c9c1420a3..0cb3f9577629 100644 --- a/src/lib_scoru_wasm/helpers/dune +++ b/src/lib_scoru_wasm/helpers/dune @@ -3,16 +3,16 @@ (library (name tezos_scoru_wasm_helpers) - (public_name tezos-scoru-wasm-helpers) + (public_name octez-l2-libs.tezos-scoru-wasm-helpers) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding octez-libs.tezos-base.unix octez-libs.tezos-context.disk - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast + octez-l2-libs.tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune index 386454c8299c..bccc3bdea7e1 100644 --- a/src/lib_scoru_wasm/regressions/dune +++ b/src/lib_scoru_wasm/regressions/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-test-helpers tezos-protocol-alpha tezos-smart-rollup-alpha diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune index fdc7fd78f4be..39d847d4e820 100644 --- a/src/lib_scoru_wasm/test/dune +++ b/src/lib_scoru_wasm/test/dune @@ -12,12 +12,12 @@ octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers - octez-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm qcheck-alcotest octez-alcotezt - tezos-scoru-wasm-helpers - tezos_scoru_wasm_test_helpers - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm-helpers + octez-l2-libs.tezos_scoru_wasm_test_helpers + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) @@ -61,7 +61,7 @@ (rule (alias runtest) - (package tezos-scoru-wasm-test) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_scoru_wasm/test/durable_snapshot/dune b/src/lib_scoru_wasm/test/durable_snapshot/dune index 34b957e7da7c..062c7979ecfc 100644 --- a/src/lib_scoru_wasm/test/durable_snapshot/dune +++ b/src/lib_scoru_wasm/test/durable_snapshot/dune @@ -3,12 +3,12 @@ (library (name tezos_scoru_wasm_durable_snapshot) - (package tezos-scoru-wasm-durable-snapshot) + (public_name octez-l2-libs.tezos_scoru_wasm_durable_snapshot) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_scoru_wasm/test/helpers/dune b/src/lib_scoru_wasm/test/helpers/dune index 35caf1a0c5d1..79f908a8bab1 100644 --- a/src/lib_scoru_wasm/test/helpers/dune +++ b/src/lib_scoru_wasm/test/helpers/dune @@ -3,7 +3,7 @@ (library (name tezos_scoru_wasm_test_helpers) - (package tezos-scoru-wasm-test-helpers) + (public_name octez-l2-libs.tezos_scoru_wasm_test_helpers) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base @@ -12,13 +12,13 @@ octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers - octez-libs.tezos-scoru-wasm - tezos_scoru_wasm_durable_snapshot - tezos-scoru-wasm-fast - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos_scoru_wasm_durable_snapshot + octez-l2-libs.tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm-helpers qcheck-alcotest octez-alcotezt - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_smart_rollup/dune b/src/lib_smart_rollup/dune index 18459aaba35a..9f2484ae7fb4 100644 --- a/src/lib_smart_rollup/dune +++ b/src/lib_smart_rollup/dune @@ -3,7 +3,7 @@ (library (name octez_smart_rollup) - (public_name octez-smart-rollup) + (public_name octez-l2-libs.octez-smart-rollup) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base @@ -17,3 +17,5 @@ -open Tezos_base -open Tezos_stdlib_unix -open Tezos_crypto)) + +(documentation (package octez-l2-libs)) diff --git a/src/lib_smart_rollup/index.mld b/src/lib_smart_rollup/index.mld index bfb3472f26dc..06eb3a692d79 100644 --- a/src/lib_smart_rollup/index.mld +++ b/src/lib_smart_rollup/index.mld @@ -4,3 +4,14 @@ This is a package containing some libraries used by the layer 2 of Octez. It contains the following libraries: +- {{!module-Octez_smart_rollup}Octez_smart_rollup}: Octez: library for Smart Rollups +- {{!module-Octez_smart_rollup_wasm_benchmark_lib}Octez_smart_rollup_wasm_benchmark_lib}: Smart Rollup WASM benchmark library +- {{!module-Tezos_layer2_store}Tezos_layer2_store}: Tezos: layer2 storage utils +- {{!module-Tezos_scoru_wasm}Tezos_scoru_wasm} +- {{!module-Tezos_scoru_wasm_durable_snapshot}Tezos_scoru_wasm_durable_snapshot}: Durable storage reference implementation +- {{!module-Tezos_scoru_wasm_fast}Tezos_scoru_wasm_fast}: WASM functionality for SCORU Fast Execution +- {{!module-Tezos_scoru_wasm_helpers}Tezos_scoru_wasm_helpers}: Helpers for the smart rollup wasm functionality and debugger +- {{!module-Tezos_scoru_wasm_test_helpers}Tezos_scoru_wasm_test_helpers}: Helpers for test of the smart rollup wasm functionality +- {{!module-Tezos_wasmer}Tezos_wasmer}: Wasmer bindings for SCORU WASM +- {{!module-Tezos_webassembly_interpreter}Tezos_webassembly_interpreter} +- {{!module-Tezos_webassembly_interpreter_extra}Tezos_webassembly_interpreter_extra}: Additional modules from the WebAssembly REPL used in testing diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune index dbdf90212858..75afd8988e04 100644 --- a/src/lib_smart_rollup_node/dune +++ b/src/lib_smart_rollup_node/dune @@ -20,10 +20,10 @@ tezos-dac-client-lib octez-injector tezos-version.value - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-workers - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index f4ca3ba9d05a..474bb9df7e9e 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -12,7 +12,7 @@ octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_wasmer/dune b/src/lib_wasmer/dune index cc48723f707f..26d49c8edbc4 100644 --- a/src/lib_wasmer/dune +++ b/src/lib_wasmer/dune @@ -3,7 +3,7 @@ (library (name tezos_wasmer) - (public_name tezos-wasmer) + (public_name octez-l2-libs.tezos-wasmer) (instrumentation (backend bisect_ppx)) (libraries ctypes diff --git a/src/lib_wasmer/test/dune b/src/lib_wasmer/test/dune index 94a2a1623616..8dca9985635b 100644 --- a/src/lib_wasmer/test/dune +++ b/src/lib_wasmer/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-wasmer + octez-l2-libs.tezos-wasmer octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -26,7 +26,7 @@ (rule (alias runtest) - (package octez-wasmer-test) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_webassembly/bin/dune b/src/lib_webassembly/bin/dune index 2ad524707c9e..83473b1902fe 100644 --- a/src/lib_webassembly/bin/dune +++ b/src/lib_webassembly/bin/dune @@ -5,8 +5,8 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-webassembly-interpreter - tezos-webassembly-interpreter-extra + octez-l2-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter-extra lwt.unix octez-libs.tezos-tree-encoding octez-libs.tezos-lazy-containers) diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index 246eacf4d614..e38c41f08fd4 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -3,7 +3,7 @@ (library (name tezos_webassembly_interpreter) - (public_name octez-libs.tezos-webassembly-interpreter) + (public_name octez-l2-libs.tezos-webassembly-interpreter) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-lwt-result-stdlib diff --git a/src/lib_webassembly/extra/dune b/src/lib_webassembly/extra/dune index c9a71978cabe..ae02724ba3fb 100644 --- a/src/lib_webassembly/extra/dune +++ b/src/lib_webassembly/extra/dune @@ -3,10 +3,10 @@ (library (name tezos_webassembly_interpreter_extra) - (public_name tezos-webassembly-interpreter-extra) + (public_name octez-l2-libs.tezos-webassembly-interpreter-extra) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter lwt.unix octez-libs.tezos-lazy-containers) (flags diff --git a/src/lib_webassembly/tests/dune b/src/lib_webassembly/tests/dune index 63f2382774fd..0c6d57416a0d 100644 --- a/src/lib_webassembly/tests/dune +++ b/src/lib_webassembly/tests/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -29,7 +29,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune index 320d927f5ffb..df9674cc9c56 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-016-PtMumbai octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index 94aaa6429453..ce351a0bb733 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -18,11 +18,11 @@ octez-libs.tezos-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - octez-libs.tezos-scoru-wasm - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune index 8abeaa7c41c6..3e4d8be00aed 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune @@ -12,7 +12,7 @@ octez-shell-libs.tezos-client-base octez-shell-libs.tezos-client-base-unix tezos-client-017-PtNairob - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-017-PtNairob tezos-smart-rollup-layer2-017-PtNairob) (flags diff --git a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune index 384b8f99ecf7..e9beac4bda18 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index 8b3adc5b4955..cb3f37b2d779 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -24,11 +24,11 @@ tezos-dal-node-lib tezos-dac-lib octez-shell-libs.tezos-shell-services - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-017-PtNairob tezos-smart-rollup-layer2-017-PtNairob tezos-layer2-utils-017-PtNairob - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-tree-encoding data-encoding @@ -39,8 +39,8 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index 4c25d65234f4..e36b5ddf011f 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -18,11 +18,11 @@ octez-libs.tezos-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - octez-libs.tezos-scoru-wasm - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune index 784a16f81b15..4568d2448465 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_client/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune @@ -12,7 +12,7 @@ octez-shell-libs.tezos-client-base octez-shell-libs.tezos-client-base-unix tezos-client-018-Proxford - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-018-Proxford tezos-smart-rollup-layer2-018-Proxford) (flags diff --git a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune index 07dc22f9a1c9..633cca408229 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-018-Proxford octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index 01451cb6dffd..ef5b51e5c48a 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -26,11 +26,11 @@ tezos-dac-lib tezos-dac-client-lib octez-shell-libs.tezos-shell-services - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-018-Proxford tezos-smart-rollup-layer2-018-Proxford tezos-layer2-utils-018-Proxford - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-tree-encoding data-encoding @@ -41,8 +41,8 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) (flags diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 639cd07320c8..a901c13cb0a8 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -18,11 +18,11 @@ octez-libs.tezos-test-helpers tezos-alpha-test-helpers octez-alcotezt - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - octez-libs.tezos-scoru-wasm - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune index 5dbc0093eb13..880c6b25eaba 100644 --- a/src/proto_alpha/lib_sc_rollup_client/dune +++ b/src/proto_alpha/lib_sc_rollup_client/dune @@ -12,7 +12,7 @@ octez-shell-libs.tezos-client-base octez-shell-libs.tezos-client-base-unix tezos-client-alpha - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-alpha tezos-smart-rollup-layer2-alpha) (flags diff --git a/src/proto_alpha/lib_sc_rollup_layer2/dune b/src/proto_alpha/lib_sc_rollup_layer2/dune index faf0ccf31e76..a5cb13ec097c 100644 --- a/src/proto_alpha/lib_sc_rollup_layer2/dune +++ b/src/proto_alpha/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-alpha octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index 66d4455e9224..228c5a00d342 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -26,11 +26,11 @@ tezos-dac-lib tezos-dac-client-lib octez-shell-libs.tezos-shell-services - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-alpha tezos-smart-rollup-layer2-alpha tezos-layer2-utils-alpha - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-tree-encoding data-encoding @@ -41,8 +41,8 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) (flags -- GitLab From a44c2f71e58b6af66e6254a7951d2e5a8d9799ff Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 3 Aug 2023 15:01:17 +0200 Subject: [PATCH 09/13] Manifest: Make Tezt-Tezos a package --- .gitlab/ci/jobs/packaging/opam_package.yml | 7 ++++++ devtools/testnet_experiment_tools/dune | 2 +- dune-project | 1 + manifest/main.ml | 12 ++++++---- opam/octez-libs.opam | 7 +++--- opam/octez-shell-libs.opam | 10 ++++---- opam/octez-testnet-scenarios.opam | 2 +- opam/octogram.opam | 2 +- opam/tezos-protocol-017-PtNairob-tests.opam | 1 + opam/tezos-protocol-018-Proxford-tests.opam | 1 + opam/tezos-protocol-alpha-tests.opam | 1 + opam/tezos-tps-evaluation.opam | 1 + opam/tezt-ethereum.opam | 2 +- opam/tezt-tezos.opam | 24 +++++++++++++++++++ src/bin_dal_node/dune | 2 +- src/bin_node/dune | 2 +- src/bin_octogram/dune | 2 +- src/bin_testnet_scenarios/dune | 2 +- src/bin_tps_evaluation/dune | 6 ++--- src/lib_base/index.mld | 3 --- src/lib_dal_node/dune | 2 +- src/lib_dal_node/gossipsub/dune | 2 +- src/lib_mockup/dune | 2 +- src/lib_octogram/dune | 2 +- src/lib_p2p/dune | 2 +- src/lib_p2p/test/common/dune | 2 +- src/lib_p2p/test/dune | 4 ++-- src/lib_p2p/tezt/dune | 2 +- src/lib_shell/dune | 2 +- src/lib_shell/index.mld | 1 + src/lib_shell/test/dune | 2 +- .../lib_protocol/test/regression/dune | 2 +- .../lib_protocol/test/regression/dune | 2 +- .../lib_protocol/test/regression/dune | 2 +- tezt/lib_ethereum/dune | 4 ++-- tezt/lib_performance_regression/dune | 4 ++-- tezt/lib_tezos/dune | 6 ++--- tezt/self_tests/dune | 4 ++-- tezt/tests/dune | 2 +- 39 files changed, 88 insertions(+), 51 deletions(-) create mode 100644 opam/tezt-tezos.opam diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 9bedd41742f3..ebc86bb7a231 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -1606,3 +1606,10 @@ opam:tezos-version: package: tezos-version # Ignoring unreleased package tezt-ethereum. + +opam:tezt-tezos: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: tezt-tezos diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune index ac68e047e712..717c94cfd5ec 100644 --- a/devtools/testnet_experiment_tools/dune +++ b/devtools/testnet_experiment_tools/dune @@ -5,7 +5,7 @@ (name testnet_experiment_tools) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos octez-shell-libs.tezos-client-base-unix octez-libs.tezos-base octez-libs.tezos-base.unix diff --git a/dune-project b/dune-project index 128f31b55b91..83cfbf5b3965 100644 --- a/dune-project +++ b/dune-project @@ -212,5 +212,6 @@ (package (name tezos-tree-encoding-test)(allow_empty)) (package (name tezos-version)) (package (name tezt-ethereum)(allow_empty)) +(package (name tezt-tezos)) ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. diff --git a/manifest/main.ml b/manifest/main.ml index ceb095464bcf..882b97df42eb 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2405,7 +2405,7 @@ let _octez_tooling_opam_lint = ~deps:[octez_tooling_opam_file_format; unix] let octez_p2p = - octez_lib + octez_shell_lib "tezos-p2p" ~path:"src/lib_p2p" ~synopsis:"Library for a pool of P2P connections" @@ -2426,16 +2426,18 @@ let octez_p2p = ] let tezt_performance_regression = - octez_lib - "tezt-performance-regression" + public_lib + "tezt-tezos.tezt-performance-regression" ~path:"tezt/lib_performance_regression" + ~opam:"tezt-tezos" ~bisect_ppx:No ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; uri; cohttp_lwt_unix] let tezt_tezos = - octez_lib + public_lib "tezt-tezos" ~path:"tezt/lib_tezos" + ~opam:"tezt-tezos" ~synopsis:"Octez test framework based on Tezt" ~bisect_ppx:No ~deps: @@ -2539,7 +2541,7 @@ let tezt_ethereum = let _tezt_self_tests = tezt ["test_michelson_script"; "test_daemon"] - ~opam:"octez-libs" + ~opam:"tezt-tezos" ~path:"tezt/self_tests" ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_] diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 5c710957cb37..46b93615e67e 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -52,11 +52,8 @@ depends: [ "mtime" { >= "1.4.0" & < "2.0.0" } "conf-libev" "uutf" - "lwt-watcher" { = "0.2" } "ringo" { >= "1.0.0" } - "prometheus" { >= "1.2" } - "tezt" { >= "3.1.1" } - "cohttp-lwt-unix" { >= "5.2.0" } + "tezt" { with-test & >= "3.1.1" } "qcheck-core" {with-test} "irmin" { >= "3.7.2" & < "3.8.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -65,8 +62,10 @@ depends: [ "integers_stubs_js" "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } + "lwt-watcher" { = "0.2" } "resto-cohttp" { >= "1.2" } "resto-cohttp-client" { >= "1.2" } + "cohttp-lwt-unix" { >= "5.2.0" } "resto-cohttp-server" { >= "1.2" } "resto-acl" { >= "1.2" } "bigstring" {with-test} diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam index 8260b46d6574..29ce1430c194 100644 --- a/opam/octez-shell-libs.opam +++ b/opam/octez-shell-libs.opam @@ -11,24 +11,26 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" + "lwt-watcher" { = "0.2" } + "lwt-canceler" { >= "0.3" & < "0.4" } + "ringo" { >= "1.0.0" } + "aches" { >= "1.0.0" } + "prometheus" { >= "1.2" } "tezt" { >= "3.1.1" } + "tezt-tezos" {with-test} "octez-alcotezt" {with-test} "astring" {with-test} "octez-proto-libs" "octez-protocol-compiler" "lwt-exit" "tezos-version" - "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } - "lwt-watcher" { = "0.2" } "camlzip" { >= "1.11" & < "1.12" } "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } - "prometheus" { >= "1.2" } "ppx_expect" - "lwt-canceler" { >= "0.3" & < "0.4" } "uri" { >= "3.1.0" } "ocplib-endian" "fmt" { >= "0.8.7" } diff --git a/opam/octez-testnet-scenarios.opam b/opam/octez-testnet-scenarios.opam index 9a97127b895e..704682067370 100644 --- a/opam/octez-testnet-scenarios.opam +++ b/opam/octez-testnet-scenarios.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "octez-libs" + "tezt-tezos" "tezt-ethereum" ] build: [ diff --git a/opam/octogram.opam b/opam/octogram.opam index 7dbd9a763f87..db39e40f04eb 100644 --- a/opam/octogram.opam +++ b/opam/octogram.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "octez-libs" + "tezt-tezos" "jingoo" "dmap" "yaml" { >= "3.1.0" } diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index b364f5ece482..ca7c8e15ac7c 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -22,6 +22,7 @@ depends: [ "tezos-benchmark-type-inference-017-PtNairob" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-017-PtNairob" {with-test} + "tezt-tezos" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} "octez-l2-libs" {with-test} diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 5b5f9b099049..1fdbc55ae1c2 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -22,6 +22,7 @@ depends: [ "tezos-benchmark-type-inference-018-Proxford" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-018-Proxford" {with-test} + "tezt-tezos" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} "octez-l2-libs" {with-test} diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 528716caf779..5688a1232e4f 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -22,6 +22,7 @@ depends: [ "tezos-benchmark-type-inference-alpha" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-alpha" {with-test} + "tezt-tezos" {with-test} "octez-shell-libs" {with-test} "octez-proto-libs" {with-test} "octez-l2-libs" {with-test} diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index de0627684a7d..580faec8bb4c 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -21,6 +21,7 @@ depends: [ "octez-shell-libs" "tezos-protocol-alpha" "tezt" { >= "3.1.1" } + "tezt-tezos" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezt-ethereum.opam b/opam/tezt-ethereum.opam index 17ad96cf748e..f5bf616e9dde 100644 --- a/opam/tezt-ethereum.opam +++ b/opam/tezt-ethereum.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "octez-libs" + "tezt-tezos" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam new file mode 100644 index 000000000000..5391162e76b2 --- /dev/null +++ b/opam/tezt-tezos.opam @@ -0,0 +1,24 @@ +# This file was automatically generated, do not edit. +# Edit file manifest/main.ml instead. +opam-version: "2.0" +maintainer: "contact@tezos.com" +authors: ["Tezos devteam"] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" +license: "MIT" +depends: [ + "dune" { >= "3.0" } + "ocaml" { >= "4.14" } + "tezt" { >= "3.1.1" } + "uri" { >= "3.1.0" } + "cohttp-lwt-unix" { >= "5.2.0" } + "hex" { >= "1.3.0" } + "octez-libs" +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Octez test framework based on Tezt" diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 514c301629d9..fe2c50eef5fa 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -28,7 +28,7 @@ octez-shell-libs.tezos-store.shared octez-libs.tezos-gossipsub tezos-dal-node-lib.gossipsub - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-crypto octez-libs.tezos-base.p2p-identity-file diff --git a/src/bin_node/dune b/src/bin_node/dune index d8da81456eae..27f244e3eafd 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -16,7 +16,7 @@ octez-shell-libs.tezos-shell-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-shell-libs.tezos-shell octez-shell-libs.tezos-store octez-shell-libs.tezos-store.unix-reconstruction diff --git a/src/bin_octogram/dune b/src/bin_octogram/dune index 0cf8e9d5b967..2131fd3bf465 100644 --- a/src/bin_octogram/dune +++ b/src/bin_octogram/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos octogram yaml) (link_flags diff --git a/src/bin_testnet_scenarios/dune b/src/bin_testnet_scenarios/dune index cf8a2f8f2743..b06a169b7304 100644 --- a/src/bin_testnet_scenarios/dune +++ b/src/bin_testnet_scenarios/dune @@ -7,7 +7,7 @@ (package octez-testnet-scenarios) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos tezt_ethereum) (flags (:standard) diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index 4fc38cecf44d..6e6fecf6627b 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -18,8 +18,8 @@ octez-shell-libs.tezos-client-base-unix tezos-protocol-alpha tezt - octez-libs.tezt-tezos - octez-libs.tezt-performance-regression + tezt-tezos + tezt-tezos.tezt-performance-regression uri) (link_flags (:standard) @@ -30,7 +30,7 @@ -open Tezt -open Tezt.Base -open Tezt_tezos - -open Tezt_performance_regression)) + -open Tezt_tezos_tezt_performance_regression)) (rule (targets sql.ml) diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index 41c674b8fcee..e2e78589e063 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -37,7 +37,6 @@ It contains the following libraries: - {{!module-Tezos_lazy_containers}Tezos_lazy_containers}: A collection of lazy containers whose contents is fetched from arbitrary backend on-demand - {{!page-tezos_lwt_result_stdlib}Tezos_lwt_result_stdlib}: error-aware stdlib replacement - {{!module-Tezos_micheline}Tezos_micheline}: Internal AST and parser for the Michelson language -- {{!module-Tezos_p2p}Tezos_p2p}: Library for a pool of P2P connections - {{!module-Tezos_p2p_services}Tezos_p2p_services}: Descriptions of RPCs exported by [tezos-p2p] - {{!module-Tezos_requester}Tezos_requester} - {{!module-Tezos_rpc}Tezos_rpc}: Library of auto-documented RPCs (service and hierarchy descriptions) @@ -52,8 +51,6 @@ It contains the following libraries: - {{!module-Tezos_tree_encoding}Tezos_tree_encoding}: A general-purpose library to encode arbitrary data in Merkle trees - {{!module-Tezos_version}Tezos_version}: Version information generated from Git - {{!page-tezos_workers}Tezos_workers}: Worker library -- {{!module-Tezt_performance_regression}Tezt_performance_regression} -- {{!module-Tezt_tezos}Tezt_tezos}: Octez test framework based on Tezt - {{!module-Traced_functor_outputs}Traced_functor_outputs} - {{!module-Traced_sigs}Traced_sigs} - {{!module-Traced_structs}Traced_structs} diff --git a/src/lib_dal_node/dune b/src/lib_dal_node/dune index 70d1da5d457d..bb307b9ce5e3 100644 --- a/src/lib_dal_node/dune +++ b/src/lib_dal_node/dune @@ -14,7 +14,7 @@ octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto-dal - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services) (flags (:standard) diff --git a/src/lib_dal_node/gossipsub/dune b/src/lib_dal_node/gossipsub/dune index c1aca057b703..d686b76af941 100644 --- a/src/lib_dal_node/gossipsub/dune +++ b/src/lib_dal_node/gossipsub/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-crypto-dal octez-libs.tezos-gossipsub - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-crypto) (flags diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 389f46d5b7ac..9c312830a5f9 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -28,7 +28,7 @@ resto-cohttp-self-serving-client octez-libs.tezos-rpc octez-libs.tezos-p2p-services - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix octez-libs.tezos-rpc-http diff --git a/src/lib_octogram/dune b/src/lib_octogram/dune index 903b825e8b25..8442970e5e1b 100644 --- a/src/lib_octogram/dune +++ b/src/lib_octogram/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos jingoo dmap) (flags diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune index bde1f4b880e6..44e98363c4e6 100644 --- a/src/lib_p2p/dune +++ b/src/lib_p2p/dune @@ -3,7 +3,7 @@ (library (name tezos_p2p) - (public_name octez-libs.tezos-p2p) + (public_name octez-shell-libs.tezos-p2p) (instrumentation (backend bisect_ppx)) (libraries lwt-watcher diff --git a/src/lib_p2p/test/common/dune b/src/lib_p2p/test/common/dune index 75c112ecefe1..ded7027f87d8 100644 --- a/src/lib_p2p/test/common/dune +++ b/src/lib_p2p/test/common/dune @@ -11,7 +11,7 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services) (flags (:standard) diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index e178b08cb94c..03ae158f874f 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -19,13 +19,13 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers octez-shell-libs.tezos_p2p_test_common octez-libs.tezos-p2p-services - octez-libs.tezt-tezos + tezt-tezos tezt octez-alcotezt astring) diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index b0d8579f8d43..be0ee831ba61 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 033686baf67c..4d50e6ca00e2 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -18,7 +18,7 @@ octez-proto-libs.tezos-protocol-environment octez-shell-libs.tezos-context-ops octez-shell-libs.tezos-shell-context - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-stdlib-unix octez-shell-libs.tezos-shell-services octez-libs.tezos-p2p-services diff --git a/src/lib_shell/index.mld b/src/lib_shell/index.mld index 354449603879..e5e09198ee14 100644 --- a/src/lib_shell/index.mld +++ b/src/lib_shell/index.mld @@ -13,6 +13,7 @@ It contains the following libraries: - {{!module-Tezos_mockup_commands}Tezos_mockup_commands}: Tezos: library of auto-documented RPCs (commands) - {{!module-Tezos_mockup_proxy}Tezos_mockup_proxy}: Tezos: local RPCs - {{!module-Tezos_mockup_registration}Tezos_mockup_registration}: Tezos: protocol registration for the mockup mode +- {{!module-Tezos_p2p}Tezos_p2p}: Library for a pool of P2P connections - {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} - {{!module-Tezos_protocol_updater}Tezos_protocol_updater}: Economic-protocol dynamic loading for `octez-node` - {{!module-Tezos_proxy}Tezos_proxy}: Tezos: proxy diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index f25533c44f73..3357137fcfd7 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -14,7 +14,7 @@ octez-shell-libs.tezos-context-ops octez-shell-libs.tezos-shell-context octez-shell-libs.tezos-protocol-updater - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-requester octez-shell-libs.tezos-shell diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune index ddb3b27992a0..f0fee8ae0d69 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezt-tezos + tezt-tezos tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob diff --git a/src/proto_018_Proxford/lib_protocol/test/regression/dune b/src/proto_018_Proxford/lib_protocol/test/regression/dune index 7206fdc25731..b317785353be 100644 --- a/src/proto_018_Proxford/lib_protocol/test/regression/dune +++ b/src/proto_018_Proxford/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezt-tezos + tezt-tezos tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index 56c4c7b779f5..308866588f54 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezt-tezos + tezt-tezos tezos-protocol-alpha tezos-client-alpha tezos-protocol-plugin-alpha diff --git a/tezt/lib_ethereum/dune b/tezt/lib_ethereum/dune index cf174fa6fb97..8efa3ebbffc2 100644 --- a/tezt/lib_ethereum/dune +++ b/tezt/lib_ethereum/dune @@ -6,9 +6,9 @@ (package tezt-ethereum) (libraries tezt - octez-libs.tezt-performance-regression) + tezt-tezos.tezt-performance-regression) (flags (:standard) -open Tezt -open Tezt.Base - -open Tezt_performance_regression)) + -open Tezt_tezos_tezt_performance_regression)) diff --git a/tezt/lib_performance_regression/dune b/tezt/lib_performance_regression/dune index fb6ff512def6..dc272e706ac3 100644 --- a/tezt/lib_performance_regression/dune +++ b/tezt/lib_performance_regression/dune @@ -2,8 +2,8 @@ ; Edit file manifest/main.ml instead. (library - (name tezt_performance_regression) - (public_name octez-libs.tezt-performance-regression) + (name tezt_tezos_tezt_performance_regression) + (public_name tezt-tezos.tezt-performance-regression) (libraries tezt uri diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune index 334d2d8f9c86..8515f72e6f0e 100644 --- a/tezt/lib_tezos/dune +++ b/tezt/lib_tezos/dune @@ -3,10 +3,10 @@ (library (name tezt_tezos) - (public_name octez-libs.tezt-tezos) + (public_name tezt-tezos) (libraries tezt - octez-libs.tezt-performance-regression + tezt-tezos.tezt-performance-regression uri hex octez-libs.tezos-crypto-dal @@ -17,4 +17,4 @@ (:standard) -open Tezt -open Tezt.Base - -open Tezt_performance_regression)) + -open Tezt_tezos_tezt_performance_regression)) diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune index 69eea0b930ae..d8dba2f9aecc 100644 --- a/tezt/self_tests/dune +++ b/tezt/self_tests/dune @@ -7,7 +7,7 @@ (libraries tezt.core tezt - octez-libs.tezt-tezos) + tezt-tezos) (library_flags (:standard -linkall)) (flags (:standard) @@ -28,7 +28,7 @@ (rule (alias runtest) - (package octez-libs) + (package tezt-tezos) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/tezt/tests/dune b/tezt/tests/dune index 60386c208aab..e6a51ae8f7b5 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -9,7 +9,7 @@ tezt str bls12-381 - octez-libs.tezt-tezos + tezt-tezos tezt_ethereum data-encoding octez-libs.tezos-base -- GitLab From b7273545c8afe912d83073dfb98b8c7606c2135c Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 8 Aug 2023 12:07:27 +0200 Subject: [PATCH 10/13] Docs: Fix doc generation --- docs/doc_gen/dune | 4 ++-- docs/doc_gen/errors/dune | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 72d85e7167be..e26c6968cba4 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -4,9 +4,9 @@ (libraries octez-libs.tezos-base octez-libs.tezos-rpc octez-libs.tezos-stdlib-unix - tezos-shell + octez-shell-libs.tezos-shell octez-libs.tezos-rpc-http-server - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater ; TODO tezos/tezos#2170: adapt next line(s) tezos-embedded-protocol-genesis tezos-embedded-protocol-016-PtMumbai diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune index aca73b55195e..169ee09d0683 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -1,7 +1,7 @@ (executable (name error_doc) (libraries data-encoding - tezos-shell + octez-shell-libs.tezos-shell tezos-client-alpha) (flags (:standard -open Tezos_base -open Tezos_error_monad -- GitLab From 44e2d9a46b50ffe0aa63296e390b777ae04c235d Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Fri, 18 Aug 2023 17:23:11 +0200 Subject: [PATCH 11/13] Docs: Fix doc with new packages --- docs/alpha/validation.rst | 2 +- ...tributing-adding-a-new-opam-dependency.rst | 2 +- docs/developer/long-tezts.rst | 2 +- docs/developer/testing.rst | 2 +- docs/nairobi/validation.rst | 2 +- docs/oxford/validation.rst | 2 +- docs/shell/p2p.rst | 2 +- docs/shell/protocol_environment.rst | 2 +- docs/shell/storage.rst | 2 +- docs/shell/the_big_picture.rst | 30 +++++++++---------- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/alpha/validation.rst b/docs/alpha/validation.rst index 9eaad6f2ef83..8e486eb9817a 100644 --- a/docs/alpha/validation.rst +++ b/docs/alpha/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V10``, and it is implemented by this protocol in the diff --git a/docs/developer/contributing-adding-a-new-opam-dependency.rst b/docs/developer/contributing-adding-a-new-opam-dependency.rst index 07be56ef5c88..7865f9728a44 100644 --- a/docs/developer/contributing-adding-a-new-opam-dependency.rst +++ b/docs/developer/contributing-adding-a-new-opam-dependency.rst @@ -50,7 +50,7 @@ For example, if you are modifying the Shell using the new dependency, you must add an entry in the ``~deps`` list of the ``let octez_shell =`` entry of the :src:`manifest/main.ml` and then run ``make -C manifest``. You should see the changes propagated onto -:src:`opam/tezos-shell.opam` and :src:`src/lib_shell/dune`. +:src:`opam/octez-libs.opam` and :src:`src/lib_shell/dune`. **Add dependencies to build files:** both opam files and dune files must be updated. diff --git a/docs/developer/long-tezts.rst b/docs/developer/long-tezts.rst index eeac39de09e0..3d8482002796 100644 --- a/docs/developer/long-tezts.rst +++ b/docs/developer/long-tezts.rst @@ -219,7 +219,7 @@ Configuring and Running Tezt Long Tests ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ For more information about how to use the configuration file, please refer -to the :package-api:`Long test module API `. +to the `Long test module API `__. A predefined configuration has already been shipped in :src:`tezt/lib_performance_regression/local-sandbox/tezt_config.json`. It allows to use the InfluxDB and Grafana instances set up by the diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index 8da2e51de31f..5af4879c0811 100644 --- a/docs/developer/testing.rst +++ b/docs/developer/testing.rst @@ -169,7 +169,7 @@ Example tests: References: - :doc:`Section in Tezos Developer Documentation on Tezt ` - `General API documentation `__ - - :package-api:`Octez-specific API documentation ` + - :package-api:`Octez-specific API documentation ` .. _long_tezt_section: diff --git a/docs/nairobi/validation.rst b/docs/nairobi/validation.rst index 75a8a3e8263e..561924426ccc 100644 --- a/docs/nairobi/validation.rst +++ b/docs/nairobi/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V8``, and it is implemented by this protocol in the diff --git a/docs/oxford/validation.rst b/docs/oxford/validation.rst index a0b0ddad6ec2..108c44aff171 100644 --- a/docs/oxford/validation.rst +++ b/docs/oxford/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V10``, and it is implemented by this protocol in the diff --git a/docs/shell/p2p.rst b/docs/shell/p2p.rst index 59ebb53a32d5..3be7bfc47b7f 100644 --- a/docs/shell/p2p.rst +++ b/docs/shell/p2p.rst @@ -17,7 +17,7 @@ The P2P layer is comprised of a pool of connections, a set of operations on those connections, and a set of workers following the worker pattern pervasively used in the codebase. -The P2P layer is packaged in :package-api:`tezos-p2p `, which has +The P2P layer is packaged in :package-api:`tezos-p2p `, which has documentation for all modules. General operation diff --git a/docs/shell/protocol_environment.rst b/docs/shell/protocol_environment.rst index 1fea47201609..711174606552 100644 --- a/docs/shell/protocol_environment.rst +++ b/docs/shell/protocol_environment.rst @@ -54,7 +54,7 @@ Here is a quick description of each file in this environment, all located under implementations are assembled into a single implementation file ``VX.ml`` by a helper program located in ``s_packer/``. -The API can be found in :package-api:`tezos-protocol-environment ` +The API can be found in :package-api:`tezos-protocol-environment ` Environment versions diff --git a/docs/shell/storage.rst b/docs/shell/storage.rst index b5d5b6da5555..90f582c3dad6 100644 --- a/docs/shell/storage.rst +++ b/docs/shell/storage.rst @@ -14,7 +14,7 @@ providing storage abstractions for blockchain data such as blocks and operations Store ##### -The store component is the :package:`tezos-store` package implemented in the :src:`src/lib_store` library. It handles the on-disk storage of static objects such as +The store component is the :package-api:`Tezos_store ` module implemented in the :src:`src/lib_store` directory. It handles the on-disk storage of static objects such as blocks, operations, block's metadata, protocols and chain data. The store also handles the chain's current state: current head, invalid blocks, active test chains, etc. The store component is designed to diff --git a/docs/shell/the_big_picture.rst b/docs/shell/the_big_picture.rst index e907531e5cc3..2f0332cddadb 100644 --- a/docs/shell/the_big_picture.rst +++ b/docs/shell/the_big_picture.rst @@ -91,7 +91,7 @@ be compiled to JavaScript. External dependencies are not shown in this illustration. Note that many packages described below are grouped in a single one: :package:`octez-libs`. -This includes packages as diverse as :package-api:`tezos-stdlib `, :package-api:`tezos-base `, :package-api:`tezos-shell-services `, :package-api:`tezos-context `, etc.) +This includes packages as diverse as :package-api:`tezos-stdlib `, :package-api:`tezos-base `, :package-api:`tezos-shell-services `, :package-api:`tezos-context `, etc.) Base and below ~~~~~~~~~~~~~~ @@ -149,7 +149,7 @@ The shell is the part of the node responsible for all communications, peer-to-peer and RPC, acting as a cocoon around the economic protocols. - - :package-api:`tezos-shell-services ` contains the definition of the + - :package-api:`tezos-shell-services ` contains the definition of the node's service hierarchy, and calling functions to use in the client (or any third party software). As this library is linked into the client to call the services in a type-safe way, only the @@ -159,16 +159,16 @@ protocols. use :opam:`cohttp` to implement the RPC over HTTP server and client, allowing to make actual use of services declared using :package-api:`tezos-rpc `. - - :package-api:`tezos-p2p ` is the in-house peer-to-peer layer. - - :package:`tezos-store` is the chain-data store that handles + - :package-api:`tezos-p2p ` is the in-house peer-to-peer layer. + - :package-api:`tezos-store ` is the chain-data store that handles on-disk block storage, snapshots exporting/importing and chain reconstruction. - :package-api:`tezos-context ` contains the raw versioned key-value store used for storing the ledger's context (one version per block). This is implemented using :opam:`irmin`. - - :package:`tezos-protocol-updater` maintains the table of available + - :package-api:`tezos-protocol-updater ` maintains the table of available protocol versions, embedded or dynamically linked. - - :package:`tezos-shell` implements the scheduling of block + - :package-api:`tezos-shell ` implements the scheduling of block validations, the mempool management, and the distributed database. A description is available in :doc:`this document <../shell/validation>`. @@ -181,7 +181,7 @@ economic protocol, as a form of static sandboxing. It also generates a functorized version of the protocol, to make the execution of the protocol in an alternative environment possible. - - :package-api:`tezos-protocol-environment ` contains the protocol + - :package-api:`tezos-protocol-environment ` contains the protocol generic environment, that is the API of the modules that are available to the economic protocol and the exported protocol API. A review of this sandbox is available :doc:`here <../shell/protocol_environment>`. @@ -202,7 +202,7 @@ protocol in an alternative environment possible. standard library as a parameter. This parameter can be filled with any of the implementations described in the two points below. - - :package-api:`tezos-shell-context ` implements a context representation + - :package-api:`tezos-shell-context ` implements a context representation that is accepted by the protocol environment. The node uses this instance to read and write data on disk. @@ -253,11 +253,11 @@ The client is split into many packages, to enforce three separation lines: shell vs economic protocol, Unix dependent vs JavaScript compatible, and library vs command-line interface. - - :package:`tezos-client-base` defines the client context, which is + - :package-api:`tezos-client-base ` defines the client context, which is an object whose methods allow for: accessing a wallet of keys, interacting via the user, making RPC calls, and signing data using signer plug-ins. Most of them, including RPC calling functions from - :package-api:`tezos-shell-services ` and + :package-api:`tezos-shell-services ` and :package:`tezos-protocol-alpha`, are abstracted over this object type. That way, it is possible to use the same code for different platforms or toolkits. @@ -266,7 +266,7 @@ compatible, and library vs command-line interface. the client context. - :package:`tezos-client-genesis` contains the basic activator commands available on the genesis protocol. - - :package:`tezos-client-base-unix` implements configuration file + - :package-api:`tezos-client-base-unix ` implements configuration file and wallet storage in Unix files, user interaction via the Unix console, and terminal based signer plug-ins. @@ -280,14 +280,14 @@ run them. - :src:`tezt/`: end-to-end tests as Tezt tests that e.g. launch local sandboxed nodes and performs various tasks using the client - - :package-api:`tezos-p2p ` + - :package-api:`tezos-p2p ` (in directory :src:`src/lib_p2p/test/`): tests of the peer-to-peer layer, independently of the Tezos gossip protocol (establishing connections, propagating peers, etc.) - - :package-api:`tezos-protocol-environment ` + - :package-api:`tezos-protocol-environment ` (in directory :src:`src/lib_protocol_environment/test/`): tests for the in-memory context implementation. - - :package:`tezos-shell` + - :package-api:`tezos-shell ` (in directory :src:`src/lib_shell/test/`): tests for the chain data storage. - :package-api:`tezos-stdlib ` @@ -296,7 +296,7 @@ run them. - :package-api:`tezos-context ` (in directory :src:`src/lib_context/test/`): tests for the versioned key-value context. - - :package:`tezos-store` + - :package-api:`tezos-store ` (in directory :src:`src/lib_store/unix/test/`): tests for the on-disk store. - :package:`tezos-protocol-alpha` -- GitLab From de91fd071ae76baac28355541511d2a847eb5ebc Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 9 Aug 2023 16:59:08 +0200 Subject: [PATCH 12/13] Tezt: Fix Tezt dune files --- tezt/long_tests/dune | 6 +++--- tezt/manual_tests/dune | 2 +- tezt/remote_tests/dune | 2 +- tezt/snoop/dune | 2 +- tezt/vesting_contract_test/dune | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 0acbdbbd03d0..2c0242ecf5f6 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -1,8 +1,8 @@ (executable (name main) (libraries tezt - octez-libs.tezt-tezos - octez-libs.tezt-performance-regression + tezt-tezos + tezt-tezos.tezt-performance-regression octez-libs.tezos-lwt-result-stdlib tezos-alpha-test-helpers octez-libs.tezos-micheline @@ -19,7 +19,7 @@ -open Tezt_tezos -open Tezt_tezos.Runnable.Syntax -open Tezt.Base - -open Tezt_performance_regression + -open Tezt_tezos_tezt_performance_regression -open Tezos_lwt_result_stdlib -open Tezos_event_logging -open Tezos_test_helpers diff --git a/tezt/manual_tests/dune b/tezt/manual_tests/dune index ba97e6a06752..b61dedc1f0f6 100644 --- a/tezt/manual_tests/dune +++ b/tezt/manual_tests/dune @@ -1,7 +1,7 @@ (executable (name main) (libraries - octez-libs.tezt-tezos + tezt-tezos yes_wallet_lib src_proto_alpha_lib_client_test_tezt_lib) (flags (:standard diff --git a/tezt/remote_tests/dune b/tezt/remote_tests/dune index 8d3f57be5285..031aac7556a3 100644 --- a/tezt/remote_tests/dune +++ b/tezt/remote_tests/dune @@ -1,5 +1,5 @@ (executable (name main) (libraries - octez-libs.tezt-tezos) + tezt-tezos) (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/snoop/dune b/tezt/snoop/dune index 8d3f57be5285..031aac7556a3 100644 --- a/tezt/snoop/dune +++ b/tezt/snoop/dune @@ -1,5 +1,5 @@ (executable (name main) (libraries - octez-libs.tezt-tezos) + tezt-tezos) (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index 0f1bce4abff7..3b68a42e2e38 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -4,7 +4,7 @@ tezos-alpha-test-helpers octez-libs.tezos-micheline tezos-protocol-alpha - octez-libs.tezt-tezos + tezt-tezos ptime) (flags (:standard (:include %{workspace_root}/macos-link-flags.sexp) -- GitLab From a5ad7c637fa4ff79d00f4427c18655f7ac28e9fc Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Fri, 25 Aug 2023 10:04:50 +0200 Subject: [PATCH 13/13] Manifest: Remove runtest for Octez_benchmark opam package --- manifest/main.ml | 3 +++ opam/tezos-benchmark.opam | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 882b97df42eb..7dd1069f77c3 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3949,6 +3949,9 @@ let octez_benchmark = opam_only "hashcons" V.True; ] ~inline_tests:ppx_expect + (* We disable tests for this package as they require Python, which is not + installed in the image of the opam jobs. *) + ~opam_with_test:Never let octez_benchmark_examples = public_lib diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index 747f63bc6e4d..1bcb876e3c7e 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -21,9 +21,5 @@ depends: [ "ocaml-migrate-parsetree" "hashcons" ] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] +build: [["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs]] synopsis: "Tezos: library for writing benchmarks and performing simple parameter inference" -- GitLab