From f9150f6ceeac2ef551618687167b6ea3bb4e99f3 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 31 May 2023 16:44:49 +0200 Subject: [PATCH 1/3] Manifest: Add octez_lib function and registration --- manifest/main.ml | 101 +++++++++++++++++- src/lib_base/index.mld | 6 ++ src/lib_workers/dune | 2 +- .../{index.mld => tezos_workers.mld} | 0 4 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 src/lib_base/index.mld rename src/lib_workers/{index.mld => tezos_workers.mld} (100%) diff --git a/manifest/main.ml b/manifest/main.ml index 46b717a428c0..83fe413effca 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -452,6 +452,98 @@ let alcotezt = ~deps:[tezt_core_lib] |> open_ +type sub_lib_documentation_link = Module of string | Page of string + +(* List of the registered sublibraries of octez-libs *) +let registered_octez_libs : sub_lib_documentation_link 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 ?synopsis:_ public_name ~path = + 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 -> Module (String.capitalize_ascii name) + | Some (docs : Dune.s_expr) when docs = [Dune.[S "package"; S "octez-libs"]] + -> + (* In that specific case, we don't want the page to be used *) + Module (String.capitalize_ascii name) + | Some _docs -> Page name + in + registered_octez_libs := registered :: !registered_octez_libs ; + public_lib + ("octez-libs." ^ public_name) + ~internal_name:name + ~opam:"octez-libs" + ~synopsis:"Octez libs" + ~opam_with_test:Always + ?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 + +(* 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 + | Module registered -> + Format.fprintf pp "- {{!module-%s}%s}" registered registered + | Page registered -> + Format.fprintf pp "- {{!page-%s}%s}" registered registered + in + Format.fprintf + fmt + "%s%a" + header + (Format.pp_print_list + ~pp_sep:(fun pp () -> Format.fprintf pp "@.") + pp_registered) + @@ List.sort + (fun lib1 lib2 -> + match (lib1, lib2) with + | Page n1, Page n2 + | Page n1, Module n2 + | Module n1, Page n2 + | Module n1, Module n2 -> + String.compare n1 n2) + registered_octez_libs + let octez_test_helpers = public_lib "tezos-test-helpers" @@ -2282,7 +2374,9 @@ let octez_workers = "tezos-workers" ~path:"src/lib_workers" ~synopsis:"Tezos: worker library" - ~documentation:[Dune.[S "package"; S "tezos-workers"]] + ~documentation: + Dune. + [[S "package"; S "tezos-workers"]; [S "mld_files"; S "tezos_workers"]] ~deps: [ octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -7992,4 +8086,9 @@ let () = write "script-inputs/active_protocol_versions_without_number" @@ fun fmt -> List.iter (write_protocol fmt) Protocol.active +(* Generate documentation index for Octez-libs *) +let () = + write "src/lib_base/index.mld" @@ fun fmt -> + pp_octez_libs_index fmt !registered_octez_libs + let () = postcheck ~exclude () diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld new file mode 100644 index 000000000000..718a000d124b --- /dev/null +++ b/src/lib_base/index.mld @@ -0,0 +1,6 @@ +{0 Octez-libs: octez libraries} + +This is a package containing some libraries used by the Octez project. + +It contains the following libraries: + diff --git a/src/lib_workers/dune b/src/lib_workers/dune index 0354d9856135..0460d5b0ee33 100644 --- a/src/lib_workers/dune +++ b/src/lib_workers/dune @@ -14,4 +14,4 @@ -open Tezos_base -open Tezos_stdlib_unix)) -(documentation (package tezos-workers)) +(documentation (package tezos-workers) (mld_files tezos_workers)) diff --git a/src/lib_workers/index.mld b/src/lib_workers/tezos_workers.mld similarity index 100% rename from src/lib_workers/index.mld rename to src/lib_workers/tezos_workers.mld -- GitLab From 9f185b087e10afa71bffcf4097a2f20fc846af84 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 17 Jul 2023 14:21:18 +0200 Subject: [PATCH 2/3] Manifest: Register some libraries as octez-libs --- .gitlab/ci/jobs/packaging/opam_package.yml | 333 +++++------------- devtools/get_contracts/dune | 8 +- devtools/tztop/dune | 2 +- devtools/yes_wallet/dune | 6 +- devtools/yes_wallet/test/dune | 4 +- docs/doc_gen/dune | 8 +- dune-project | 27 +- manifest/main.ml | 178 +++++----- opam/internal-devtools.opam | 2 +- opam/octez-accuser-Proxford.opam | 3 +- opam/octez-accuser-PtMumbai.opam | 3 +- opam/octez-accuser-PtNairob.opam | 3 +- opam/octez-accuser-alpha.opam | 3 +- opam/octez-baker-Proxford.opam | 3 +- opam/octez-baker-PtMumbai.opam | 3 +- opam/octez-baker-PtNairob.opam | 3 +- opam/octez-baker-alpha.opam | 3 +- opam/octez-bls12-381-polynomial.opam | 26 -- opam/octez-client.opam | 5 +- opam/octez-codec.opam | 4 +- opam/octez-crawler.opam | 4 +- opam/octez-dac-client.opam | 4 +- opam/octez-dac-node.opam | 7 +- opam/octez-dal-node.opam | 13 +- opam/octez-evm-chunker.opam | 2 +- opam/octez-evm-proxy-lib.opam | 4 +- opam/octez-evm-proxy.opam | 4 +- opam/octez-evm-upgrade-signer.opam | 2 +- opam/octez-injector.opam | 6 +- opam/octez-libs.opam | 75 ++++ opam/octez-node-config.opam | 7 +- opam/octez-node.opam | 9 +- opam/octez-plompiler.opam | 2 +- opam/octez-plonk.opam | 2 +- opam/octez-polynomial.opam | 24 -- opam/octez-protocol-compiler.opam | 3 +- opam/octez-proxy-server.opam | 7 +- opam/octez-signer.opam | 7 +- opam/octez-smart-rollup-client-Proxford.opam | 2 +- opam/octez-smart-rollup-client-PtMumbai.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 | 11 +- opam/octez-smart-rollup-node-PtMumbai.opam | 11 +- opam/octez-smart-rollup-node-PtNairob.opam | 11 +- opam/octez-smart-rollup-node-alpha.opam | 11 +- opam/octez-smart-rollup-node-lib.opam | 5 +- opam/octez-smart-rollup-node.opam | 3 +- opam/octez-smart-rollup-sequencer-node.opam | 2 +- opam/octez-smart-rollup-sequencer.opam | 6 +- ...octez-smart-rollup-wasm-benchmark-lib.opam | 3 +- opam/octez-smart-rollup-wasm-benchmark.opam | 2 +- opam/octez-smart-rollup-wasm-debugger.opam | 3 +- opam/octez-smart-rollup.opam | 5 +- opam/octez-snoop.opam | 3 +- opam/octez-srs-extraction.opam | 2 +- opam/octez-testnet-scenarios.opam | 2 +- opam/scoru-sequencer-test.opam | 3 +- opam/tezos-016-PtMumbai-test-helpers.opam | 6 +- opam/tezos-017-PtNairob-test-helpers.opam | 6 +- opam/tezos-018-Proxford-test-helpers.opam | 6 +- opam/tezos-alpha-test-helpers.opam | 6 +- opam/tezos-baking-016-PtMumbai-commands.opam | 5 +- opam/tezos-baking-016-PtMumbai.opam | 12 +- opam/tezos-baking-017-PtNairob-commands.opam | 5 +- opam/tezos-baking-017-PtNairob.opam | 12 +- opam/tezos-baking-018-Proxford-commands.opam | 5 +- opam/tezos-baking-018-Proxford.opam | 12 +- opam/tezos-baking-alpha-commands.opam | 5 +- opam/tezos-baking-alpha.opam | 12 +- opam/tezos-base-test-helpers.opam | 25 -- opam/tezos-base.opam | 38 -- opam/tezos-benchmark-016-PtMumbai.opam | 6 +- opam/tezos-benchmark-017-PtNairob.opam | 6 +- opam/tezos-benchmark-018-Proxford.opam | 6 +- opam/tezos-benchmark-alpha.opam | 6 +- opam/tezos-benchmark-examples.opam | 4 +- opam/tezos-benchmark-tests.opam | 5 +- ...benchmark-type-inference-016-PtMumbai.opam | 5 +- ...benchmark-type-inference-017-PtNairob.opam | 5 +- ...benchmark-type-inference-018-Proxford.opam | 5 +- .../tezos-benchmark-type-inference-alpha.opam | 5 +- opam/tezos-benchmark.opam | 5 +- opam/tezos-benchmarks-proto-016-PtMumbai.opam | 7 +- opam/tezos-benchmarks-proto-017-PtNairob.opam | 7 +- opam/tezos-benchmarks-proto-018-Proxford.opam | 7 +- opam/tezos-benchmarks-proto-alpha.opam | 7 +- opam/tezos-clic.opam | 4 +- opam/tezos-client-000-Ps9mPmXa.opam | 5 +- opam/tezos-client-001-PtCJ7pwo.opam | 5 +- opam/tezos-client-002-PsYLVpVv.opam | 5 +- opam/tezos-client-003-PsddFKi3.opam | 5 +- opam/tezos-client-004-Pt24m4xi.opam | 5 +- opam/tezos-client-005-PsBabyM1.opam | 5 +- opam/tezos-client-006-PsCARTHA.opam | 5 +- opam/tezos-client-007-PsDELPH1.opam | 5 +- opam/tezos-client-008-PtEdo2Zk.opam | 5 +- opam/tezos-client-009-PsFLoren.opam | 5 +- opam/tezos-client-010-PtGRANAD.opam | 5 +- opam/tezos-client-011-PtHangz2.opam | 6 +- opam/tezos-client-012-Psithaca.opam | 6 +- opam/tezos-client-013-PtJakart.opam | 6 +- opam/tezos-client-014-PtKathma.opam | 6 +- opam/tezos-client-015-PtLimaPt.opam | 6 +- opam/tezos-client-016-PtMumbai.opam | 8 +- opam/tezos-client-017-PtNairob.opam | 8 +- opam/tezos-client-018-Proxford.opam | 8 +- opam/tezos-client-alpha.opam | 8 +- opam/tezos-client-base-unix.opam | 8 +- opam/tezos-client-base.opam | 4 +- opam/tezos-client-commands.opam | 6 +- opam/tezos-client-demo-counter.opam | 3 +- opam/tezos-client-genesis.opam | 4 +- opam/tezos-context-ops.opam | 4 +- opam/tezos-context.opam | 34 -- opam/tezos-crypto-dal.opam | 29 -- opam/tezos-crypto.opam | 36 -- opam/tezos-dac-017-PtNairob.opam | 4 +- opam/tezos-dac-018-Proxford.opam | 4 +- opam/tezos-dac-alpha.opam | 4 +- opam/tezos-dac-client-lib.opam | 3 +- opam/tezos-dac-lib-test.opam | 5 +- opam/tezos-dac-lib.opam | 2 +- opam/tezos-dac-node-lib-test.opam | 5 +- opam/tezos-dac-node-lib.opam | 4 +- opam/tezos-dal-016-PtMumbai.opam | 4 +- opam/tezos-dal-017-PtNairob.opam | 4 +- opam/tezos-dal-018-Proxford.opam | 4 +- opam/tezos-dal-alpha.opam | 4 +- opam/tezos-dal-node-lib.opam | 7 +- opam/tezos-dal-node-services.opam | 4 +- opam/tezos-error-monad.opam | 29 -- opam/tezos-event-logging-test-helpers.opam | 26 -- opam/tezos-event-logging.opam | 24 -- opam/tezos-gossipsub-test.opam | 2 +- opam/tezos-gossipsub.opam | 6 +- opam/tezos-hacl.opam | 37 -- opam/tezos-layer2-store.opam | 5 +- opam/tezos-layer2-utils-016-PtMumbai.opam | 2 +- opam/tezos-layer2-utils-017-PtNairob.opam | 2 +- opam/tezos-layer2-utils-018-Proxford.opam | 2 +- opam/tezos-layer2-utils-alpha.opam | 2 +- opam/tezos-lazy-containers-tests.opam | 2 +- opam/tezos-lazy-containers.opam | 21 -- opam/tezos-micheline-rewriting.opam | 5 +- opam/tezos-micheline.opam | 26 -- opam/tezos-mockup-commands.opam | 2 +- opam/tezos-mockup-proxy.opam | 5 +- opam/tezos-mockup-registration.opam | 3 +- opam/tezos-mockup.opam | 9 +- opam/tezos-p2p-services.opam | 21 -- opam/tezos-p2p.opam | 36 -- opam/tezos-protocol-011-PtHangz2.opam | 2 +- opam/tezos-protocol-012-Psithaca.opam | 2 +- opam/tezos-protocol-013-PtJakart.opam | 2 +- opam/tezos-protocol-014-PtKathma.opam | 2 +- opam/tezos-protocol-015-PtLimaPt.opam | 2 +- opam/tezos-protocol-016-PtMumbai-tests.opam | 9 +- opam/tezos-protocol-016-PtMumbai.opam | 2 +- opam/tezos-protocol-017-PtNairob-tests.opam | 9 +- opam/tezos-protocol-017-PtNairob.opam | 2 +- opam/tezos-protocol-018-Proxford-tests.opam | 9 +- opam/tezos-protocol-018-Proxford.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 9 +- opam/tezos-protocol-alpha.opam | 2 +- opam/tezos-protocol-environment.opam | 8 +- ...otocol-plugin-007-PsDELPH1-registerer.opam | 2 +- opam/tezos-protocol-plugin-007-PsDELPH1.opam | 2 +- ...otocol-plugin-008-PtEdo2Zk-registerer.opam | 2 +- opam/tezos-protocol-plugin-008-PtEdo2Zk.opam | 2 +- ...otocol-plugin-009-PsFLoren-registerer.opam | 2 +- opam/tezos-protocol-plugin-009-PsFLoren.opam | 2 +- ...otocol-plugin-010-PtGRANAD-registerer.opam | 2 +- opam/tezos-protocol-plugin-010-PtGRANAD.opam | 2 +- ...otocol-plugin-011-PtHangz2-registerer.opam | 2 +- opam/tezos-protocol-plugin-011-PtHangz2.opam | 2 +- ...otocol-plugin-012-Psithaca-registerer.opam | 2 +- opam/tezos-protocol-plugin-012-Psithaca.opam | 2 +- ...otocol-plugin-013-PtJakart-registerer.opam | 2 +- opam/tezos-protocol-plugin-013-PtJakart.opam | 2 +- ...otocol-plugin-014-PtKathma-registerer.opam | 2 +- opam/tezos-protocol-plugin-014-PtKathma.opam | 2 +- ...otocol-plugin-015-PtLimaPt-registerer.opam | 2 +- opam/tezos-protocol-plugin-015-PtLimaPt.opam | 2 +- ...otocol-plugin-016-PtMumbai-registerer.opam | 2 +- ...os-protocol-plugin-016-PtMumbai-tests.opam | 5 +- opam/tezos-protocol-plugin-016-PtMumbai.opam | 2 +- ...otocol-plugin-017-PtNairob-registerer.opam | 2 +- ...os-protocol-plugin-017-PtNairob-tests.opam | 5 +- opam/tezos-protocol-plugin-017-PtNairob.opam | 2 +- ...otocol-plugin-018-Proxford-registerer.opam | 2 +- ...os-protocol-plugin-018-Proxford-tests.opam | 5 +- opam/tezos-protocol-plugin-018-Proxford.opam | 2 +- ...ezos-protocol-plugin-alpha-registerer.opam | 2 +- opam/tezos-protocol-plugin-alpha-tests.opam | 5 +- opam/tezos-protocol-plugin-alpha.opam | 2 +- opam/tezos-protocol-updater.opam | 6 +- opam/tezos-proxy-server-config.opam | 3 +- opam/tezos-proxy.opam | 7 +- opam/tezos-requester.opam | 5 +- opam/tezos-rpc-http-client-unix.opam | 25 -- opam/tezos-rpc-http-client.opam | 23 -- opam/tezos-rpc-http-server.opam | 32 -- opam/tezos-rpc-http.opam | 23 -- opam/tezos-rpc.opam | 24 -- opam/tezos-sapling.opam | 8 +- opam/tezos-sc-rollup-node-test.opam | 2 +- opam/tezos-scoru-wasm-durable-snapshot.opam | 3 +- opam/tezos-scoru-wasm-fast-test.opam | 5 +- opam/tezos-scoru-wasm-fast.opam | 4 +- opam/tezos-scoru-wasm-helpers.opam | 4 +- opam/tezos-scoru-wasm-regressions.opam | 2 +- opam/tezos-scoru-wasm-test-helpers.opam | 5 +- opam/tezos-scoru-wasm-test.opam | 5 +- opam/tezos-scoru-wasm.opam | 5 +- opam/tezos-shell-benchmarks.opam | 7 +- opam/tezos-shell-context-test.opam | 2 +- opam/tezos-shell-context.opam | 3 +- opam/tezos-shell-services.opam | 27 -- opam/tezos-shell.opam | 14 +- opam/tezos-signer-backends.opam | 10 +- opam/tezos-signer-services.opam | 3 +- opam/tezos-smart-rollup-016-PtMumbai.opam | 2 +- opam/tezos-smart-rollup-017-PtNairob.opam | 2 +- opam/tezos-smart-rollup-018-Proxford.opam | 2 +- opam/tezos-smart-rollup-alpha.opam | 2 +- ...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-stdlib-unix.opam | 38 -- opam/tezos-stdlib.opam | 30 -- opam/tezos-store.opam | 9 +- opam/tezos-tps-evaluation.opam | 3 +- opam/tezos-tree-encoding-test.opam | 5 +- opam/tezos-tree-encoding.opam | 23 -- opam/tezos-validation.opam | 7 +- opam/tezos-version.opam | 7 +- opam/tezos-webassembly-interpreter-extra.opam | 2 +- opam/tezos-webassembly-interpreter.opam | 4 +- opam/tezos-workers.opam | 26 -- opam/tezt-tezos.opam | 26 -- scripts/gen-genesis/dune | 6 +- src/bin_client/dune | 10 +- src/bin_codec/dune | 8 +- src/bin_dac_client/dune | 8 +- src/bin_dac_node/dune | 14 +- src/bin_dal_node/dune | 28 +- src/bin_evm_proxy/chunker/dune | 2 +- src/bin_evm_proxy/dune | 8 +- src/bin_evm_proxy/lib/dune | 6 +- src/bin_evm_proxy/upgrade_signer/dune | 4 +- src/bin_node/dune | 22 +- src/bin_proxy_server/dune | 14 +- src/bin_sequencer_node/dune | 2 +- src/bin_signer/dune | 14 +- src/bin_smart_rollup_node/dune | 4 +- src/bin_snoop/dune | 6 +- src/bin_testnet_scenarios/dune | 2 +- src/bin_tps_evaluation/dune | 4 +- src/bin_wasm_debugger/dune | 6 +- src/lib_aplonk/plonk-aggregation/dune | 2 +- src/lib_base/dune | 16 +- src/lib_base/index.mld | 39 ++ src/lib_base/p2p_identity_file/dune | 6 +- src/lib_base/test/dune | 8 +- src/lib_base/test_helpers/dune | 10 +- src/lib_base/unix/dune | 16 +- src/lib_base/unix/test/dune | 10 +- src/lib_benchmark/dune | 8 +- src/lib_benchmark/example/dune | 6 +- .../lib_micheline_rewriting/dune | 8 +- .../lib_micheline_rewriting/test/dune | 4 +- src/lib_benchmark/test/dune | 10 +- src/lib_bls12_381_polynomial/dune | 2 +- src/lib_bls12_381_polynomial/test/dune | 6 +- src/lib_clic/dune | 4 +- src/lib_clic/test/dune | 2 +- src/lib_clic/unix/dune | 6 +- src/lib_client_base/dune | 6 +- src/lib_client_base/test/dune | 2 +- src/lib_client_base_unix/dune | 14 +- src/lib_client_base_unix/test/dune | 4 +- src/lib_client_commands/dune | 12 +- src/lib_context/disk/dune | 18 +- src/lib_context/dump/dune | 6 +- src/lib_context/dune | 6 +- src/lib_context/encoding/dune | 6 +- src/lib_context/helpers/dune | 12 +- src/lib_context/memory/dune | 12 +- src/lib_context/memory/test/dune | 12 +- src/lib_context/merkle_proof_encoding/dune | 8 +- src/lib_context/sigs/dune | 6 +- src/lib_context/test/dune | 16 +- src/lib_crawler/dune | 8 +- src/lib_crypto/dune | 10 +- src/lib_crypto/test-unix/dune | 10 +- src/lib_crypto/test/dune | 12 +- src/lib_crypto_dal/dal_config/dune | 2 +- src/lib_crypto_dal/dune | 12 +- src/lib_crypto_dal/test/dune | 12 +- src/lib_dac/dune | 2 +- src/lib_dac/test/dune | 8 +- src/lib_dac_client/dune | 6 +- src/lib_dac_node/dune | 8 +- src/lib_dac_node/test/dune | 8 +- src/lib_dal_node/dune | 12 +- src/lib_dal_node/gossipsub/dune | 10 +- src/lib_dal_node_services/dune | 6 +- src/lib_error_monad/dune | 4 +- src/lib_error_monad/test/dune | 6 +- src/lib_event_logging/dune | 6 +- src/lib_event_logging/test_helpers/dune | 8 +- src/lib_gossipsub/dune | 12 +- src/lib_gossipsub/test/dune | 4 +- src/lib_hacl/dune | 2 +- src/lib_hacl/gen/dune | 4 +- src/lib_hacl/test/dune | 10 +- src/lib_injector/dune | 12 +- src/lib_layer2_store/dune | 6 +- src/lib_layer2_store/test/dune | 2 +- src/lib_lazy_containers/dune | 4 +- src/lib_lazy_containers/test/dune | 2 +- src/lib_micheline/dune | 6 +- src/lib_micheline/test/dune | 8 +- src/lib_mockup/dune | 22 +- src/lib_mockup/test/dune | 6 +- src/lib_mockup_proxy/dune | 8 +- src/lib_node_config/dune | 14 +- src/lib_p2p/dune | 16 +- src/lib_p2p/test/common/dune | 14 +- src/lib_p2p/test/dune | 40 +-- src/lib_p2p/tezt/dune | 20 +- src/lib_p2p_services/dune | 6 +- src/lib_plompiler/dune | 2 +- src/lib_plonk/dune | 2 +- src/lib_plonk/test/dune | 2 +- src/lib_polynomial/dune | 2 +- src/lib_polynomial/test/dune | 4 +- src/lib_protocol_compiler/bin/dune | 10 +- src/lib_protocol_compiler/dune | 8 +- src/lib_protocol_compiler/registerer/dune | 2 +- src/lib_protocol_environment/context_ops/dune | 6 +- src/lib_protocol_environment/dune | 10 +- .../shell_context/dune | 4 +- src/lib_protocol_environment/structs/dune | 4 +- src/lib_protocol_environment/test/dune | 4 +- .../test_shell_context/dune | 2 +- src/lib_protocol_updater/dune | 10 +- src/lib_proxy/dune | 8 +- src/lib_proxy/rpc/dune | 4 +- src/lib_proxy/test/dune | 8 +- .../test_helpers/shell_services/dune | 6 +- .../test_helpers/shell_services/test/dune | 6 +- src/lib_proxy_server_config/dune | 4 +- src/lib_proxy_server_config/test/dune | 4 +- src/lib_requester/dune | 4 +- src/lib_requester/test/dune | 10 +- src/lib_rpc/dune | 4 +- src/lib_rpc_http/dune | 34 +- src/lib_rpc_http/test/dune | 14 +- src/lib_sapling/dune | 6 +- src/lib_sapling/test/dune | 14 +- src/lib_scoru_sequencer/dune | 10 +- src/lib_scoru_sequencer/test/dune | 4 +- src/lib_scoru_wasm/bench/dune | 4 +- src/lib_scoru_wasm/bench/executable/dune | 2 +- src/lib_scoru_wasm/dune | 10 +- src/lib_scoru_wasm/fast/dune | 6 +- src/lib_scoru_wasm/fast/test/dune | 10 +- src/lib_scoru_wasm/helpers/dune | 8 +- src/lib_scoru_wasm/regressions/dune | 2 +- src/lib_scoru_wasm/test/dune | 10 +- src/lib_scoru_wasm/test/durable_snapshot/dune | 4 +- src/lib_scoru_wasm/test/helpers/dune | 10 +- src/lib_shell/dune | 22 +- src/lib_shell/test/dune | 16 +- src/lib_shell_benchmarks/dune | 12 +- src/lib_shell_services/dune | 16 +- src/lib_shell_services/test/dune | 8 +- src/lib_signer_backends/dune | 10 +- src/lib_signer_backends/test/dune | 10 +- src/lib_signer_backends/unix/dune | 16 +- src/lib_signer_backends/unix/test/dune | 6 +- src/lib_signer_services/dune | 4 +- src/lib_smart_rollup/dune | 10 +- src/lib_smart_rollup_node/dune | 10 +- src/lib_srs_extraction/dune | 4 +- src/lib_stdlib/dune | 2 +- src/lib_stdlib/test-unix/dune | 4 +- src/lib_stdlib/test/dune | 6 +- src/lib_stdlib_unix/dune | 8 +- src/lib_stdlib_unix/test/dune | 8 +- src/lib_store/dune | 8 +- src/lib_store/mocked/dune | 8 +- src/lib_store/shared/dune | 8 +- src/lib_store/unix/dune | 32 +- src/lib_store/unix/test/bench/dune | 2 +- src/lib_store/unix/test/dune | 8 +- src/lib_store/unix/test/slow/dune | 2 +- src/lib_time_measurement/runtime/dune | 2 +- src/lib_tree_encoding/dune | 6 +- src/lib_tree_encoding/test/dune | 10 +- src/lib_validation/dune | 12 +- src/lib_version/dune | 6 +- src/lib_version/exe/dune | 6 +- src/lib_version/parser/dune | 2 +- src/lib_version/test/dune | 8 +- src/lib_version/value/dune | 6 +- src/lib_webassembly/bin/dune | 4 +- src/lib_webassembly/dune | 6 +- src/lib_webassembly/extra/dune | 2 +- src/lib_workers/dune | 8 +- src/lib_workers/test/dune | 12 +- src/proto_000_Ps9mPmXa/lib_client/dune | 8 +- src/proto_001_PtCJ7pwo/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_002_PsYLVpVv/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_003_PsddFKi3/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_004_Pt24m4xi/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_005_PsBabyM1/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_006_PsCARTHA/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_007_PsDELPH1/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_007_PsDELPH1/lib_plugin/dune | 4 +- src/proto_008_PtEdo2Zk/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_008_PtEdo2Zk/lib_plugin/dune | 4 +- src/proto_009_PsFLoren/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_009_PsFLoren/lib_plugin/dune | 4 +- src/proto_010_PtGRANAD/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_010_PtGRANAD/lib_plugin/dune | 4 +- src/proto_011_PtHangz2/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_011_PtHangz2/lib_parameters/dune | 4 +- src/proto_011_PtHangz2/lib_plugin/dune | 4 +- src/proto_012_Psithaca/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_012_Psithaca/lib_parameters/dune | 4 +- src/proto_012_Psithaca/lib_plugin/dune | 4 +- src/proto_013_PtJakart/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_013_PtJakart/lib_parameters/dune | 4 +- src/proto_013_PtJakart/lib_plugin/dune | 4 +- src/proto_014_PtKathma/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_014_PtKathma/lib_parameters/dune | 4 +- src/proto_014_PtKathma/lib_plugin/dune | 4 +- src/proto_015_PtLimaPt/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_015_PtLimaPt/lib_parameters/dune | 4 +- src/proto_015_PtLimaPt/lib_plugin/dune | 4 +- src/proto_016_PtMumbai/bin_accuser/dune | 4 +- src/proto_016_PtMumbai/bin_baker/dune | 4 +- .../bin_sc_rollup_client/dune | 2 +- .../bin_sc_rollup_node/dune | 4 +- src/proto_016_PtMumbai/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- .../lib_benchmark/test/dune | 6 +- .../lib_benchmarks_proto/dune | 12 +- src/proto_016_PtMumbai/lib_client/dune | 6 +- src/proto_016_PtMumbai/lib_client/test/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_016_PtMumbai/lib_dal/dune | 4 +- src/proto_016_PtMumbai/lib_dal/test/dune | 4 +- src/proto_016_PtMumbai/lib_delegate/dune | 32 +- src/proto_016_PtMumbai/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_016_PtMumbai/lib_layer2_utils/dune | 2 +- src/proto_016_PtMumbai/lib_parameters/dune | 4 +- src/proto_016_PtMumbai/lib_plugin/dune | 4 +- src/proto_016_PtMumbai/lib_plugin/test/dune | 10 +- .../lib_protocol/test/helpers/dune | 10 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 6 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 4 +- .../lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 6 +- .../lib_protocol/test/unit/dune | 12 +- src/proto_016_PtMumbai/lib_sc_rollup/dune | 2 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 22 +- .../lib_sc_rollup_node/test/dune | 2 +- .../lib_sc_rollup_node/test/helpers/dune | 2 +- src/proto_017_PtNairob/bin_accuser/dune | 4 +- src/proto_017_PtNairob/bin_baker/dune | 4 +- .../bin_sc_rollup_client/dune | 2 +- .../bin_sc_rollup_node/dune | 4 +- src/proto_017_PtNairob/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- .../lib_benchmark/test/dune | 6 +- .../lib_benchmarks_proto/dune | 12 +- src/proto_017_PtNairob/lib_client/dune | 6 +- src/proto_017_PtNairob/lib_client/test/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_017_PtNairob/lib_dac_plugin/dune | 4 +- .../lib_dac_plugin/test/dune | 4 +- src/proto_017_PtNairob/lib_dal/dune | 4 +- src/proto_017_PtNairob/lib_dal/test/dune | 4 +- src/proto_017_PtNairob/lib_delegate/dune | 32 +- src/proto_017_PtNairob/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_017_PtNairob/lib_layer2_utils/dune | 2 +- src/proto_017_PtNairob/lib_parameters/dune | 4 +- src/proto_017_PtNairob/lib_plugin/dune | 4 +- src/proto_017_PtNairob/lib_plugin/test/dune | 10 +- .../lib_protocol/test/helpers/dune | 10 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 6 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 4 +- .../lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 6 +- .../lib_protocol/test/unit/dune | 12 +- src/proto_017_PtNairob/lib_sc_rollup/dune | 2 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 22 +- .../lib_sc_rollup_node/test/dune | 2 +- .../lib_sc_rollup_node/test/helpers/dune | 2 +- src/proto_018_Proxford/bin_accuser/dune | 4 +- src/proto_018_Proxford/bin_baker/dune | 4 +- .../bin_sc_rollup_client/dune | 2 +- .../bin_sc_rollup_node/dune | 4 +- src/proto_018_Proxford/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- .../lib_benchmark/test/dune | 6 +- .../lib_benchmarks_proto/dune | 12 +- src/proto_018_Proxford/lib_client/dune | 6 +- src/proto_018_Proxford/lib_client/test/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 6 +- src/proto_018_Proxford/lib_dac_plugin/dune | 4 +- .../lib_dac_plugin/test/dune | 4 +- src/proto_018_Proxford/lib_dal/dune | 4 +- src/proto_018_Proxford/lib_dal/test/dune | 4 +- src/proto_018_Proxford/lib_delegate/dune | 32 +- src/proto_018_Proxford/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_018_Proxford/lib_layer2_utils/dune | 2 +- src/proto_018_Proxford/lib_parameters/dune | 4 +- src/proto_018_Proxford/lib_plugin/dune | 4 +- src/proto_018_Proxford/lib_plugin/test/dune | 10 +- .../lib_protocol/test/helpers/dune | 10 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 6 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 4 +- .../lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 6 +- .../lib_protocol/test/unit/dune | 12 +- src/proto_018_Proxford/lib_sc_rollup/dune | 2 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 22 +- .../lib_sc_rollup_node/test/dune | 2 +- .../lib_sc_rollup_node/test/helpers/dune | 2 +- src/proto_alpha/bin_accuser/dune | 4 +- src/proto_alpha/bin_baker/dune | 4 +- src/proto_alpha/bin_sc_rollup_client/dune | 2 +- src/proto_alpha/bin_sc_rollup_node/dune | 4 +- src/proto_alpha/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- src/proto_alpha/lib_benchmark/test/dune | 6 +- src/proto_alpha/lib_benchmarks_proto/dune | 12 +- src/proto_alpha/lib_client/dune | 6 +- src/proto_alpha/lib_client/test/dune | 6 +- src/proto_alpha/lib_client_commands/dune | 14 +- src/proto_alpha/lib_client_sapling/dune | 6 +- src/proto_alpha/lib_dac_plugin/dune | 4 +- src/proto_alpha/lib_dac_plugin/test/dune | 4 +- src/proto_alpha/lib_dal/dune | 4 +- src/proto_alpha/lib_dal/test/dune | 4 +- src/proto_alpha/lib_delegate/dune | 32 +- src/proto_alpha/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_alpha/lib_layer2_utils/dune | 2 +- src/proto_alpha/lib_parameters/dune | 4 +- src/proto_alpha/lib_plugin/dune | 4 +- src/proto_alpha/lib_plugin/test/dune | 10 +- .../lib_protocol/test/helpers/dune | 10 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 6 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 4 +- src/proto_alpha/lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 6 +- src/proto_alpha/lib_protocol/test/unit/dune | 12 +- src/proto_alpha/lib_sc_rollup/dune | 2 +- 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 | 22 +- src/proto_alpha/lib_sc_rollup_node/test/dune | 2 +- .../lib_sc_rollup_node/test/helpers/dune | 2 +- src/proto_demo_counter/lib_client/dune | 4 +- src/proto_genesis/lib_client/dune | 6 +- tezt/lib_tezos/dune | 8 +- tezt/long_tests/dune | 8 +- tezt/manual_tests/dune | 2 +- tezt/remote_tests/dune | 2 +- tezt/self_tests/dune | 4 +- tezt/snoop/dune | 2 +- tezt/tests/dune | 8 +- tezt/vesting_contract_test/dune | 6 +- 640 files changed, 1968 insertions(+), 3297 deletions(-) delete mode 100644 opam/octez-bls12-381-polynomial.opam create mode 100644 opam/octez-libs.opam delete mode 100644 opam/octez-polynomial.opam delete mode 100644 opam/tezos-base-test-helpers.opam delete mode 100644 opam/tezos-base.opam delete mode 100644 opam/tezos-context.opam delete mode 100644 opam/tezos-crypto-dal.opam delete mode 100644 opam/tezos-crypto.opam delete mode 100644 opam/tezos-error-monad.opam delete mode 100644 opam/tezos-event-logging-test-helpers.opam delete mode 100644 opam/tezos-event-logging.opam delete mode 100644 opam/tezos-hacl.opam delete mode 100644 opam/tezos-lazy-containers.opam delete mode 100644 opam/tezos-micheline.opam delete mode 100644 opam/tezos-p2p-services.opam delete mode 100644 opam/tezos-p2p.opam delete mode 100644 opam/tezos-rpc-http-client-unix.opam delete mode 100644 opam/tezos-rpc-http-client.opam delete mode 100644 opam/tezos-rpc-http-server.opam delete mode 100644 opam/tezos-rpc-http.opam delete mode 100644 opam/tezos-rpc.opam delete mode 100644 opam/tezos-shell-services.opam delete mode 100644 opam/tezos-stdlib-unix.opam delete mode 100644 opam/tezos-stdlib.opam delete mode 100644 opam/tezos-tree-encoding.opam delete mode 100644 opam/tezos-workers.opam delete 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 06ae4021eebb..e660b206afcb 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -478,13 +478,6 @@ opam:octez-bls12-381-hash: variables: package: octez-bls12-381-hash -opam:octez-bls12-381-polynomial: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-bls12-381-polynomial - opam:octez-bls12-381-signature: extends: - .opam_template @@ -562,6 +555,13 @@ opam:octez-injector: variables: package: octez-injector +opam:octez-libs: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: octez-libs + opam:octez-mec: extends: - .opam_template @@ -572,7 +572,7 @@ opam:octez-mec: opam:octez-node: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_1 + - .rules_template__trigger_exec_opam_batch_2 variables: package: octez-node @@ -593,17 +593,10 @@ opam:octez-plompiler: opam:octez-plonk: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: octez-plonk -opam:octez-polynomial: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-polynomial - opam:octez-protocol-compiler: extends: - .opam_template @@ -614,7 +607,7 @@ 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 @@ -628,7 +621,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 @@ -696,14 +689,14 @@ opam:octez-smart-rollup-node-lib: opam:octez-smart-rollup-wasm-benchmark-lib: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: octez-smart-rollup-wasm-benchmark-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 @@ -796,20 +789,6 @@ opam:tezos-baking-alpha-commands: variables: package: tezos-baking-alpha-commands -opam:tezos-base: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-base - -opam:tezos-base-test-helpers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-base-test-helpers - # Ignoring unreleased package tezos-benchmark. # Ignoring unreleased package tezos-benchmark-016-PtMumbai. @@ -850,49 +829,49 @@ opam:tezos-clic: opam:tezos-client-000-Ps9mPmXa: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-000-Ps9mPmXa opam:tezos-client-001-PtCJ7pwo: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-001-PtCJ7pwo opam:tezos-client-002-PsYLVpVv: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-002-PsYLVpVv opam:tezos-client-003-PsddFKi3: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-003-PsddFKi3 opam:tezos-client-004-Pt24m4xi: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-004-Pt24m4xi opam:tezos-client-005-PsBabyM1: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-005-PsBabyM1 opam:tezos-client-006-PsCARTHA: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-006-PsCARTHA @@ -997,21 +976,21 @@ opam:tezos-client-base: opam:tezos-client-base-unix: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .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_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-client-commands opam:tezos-client-demo-counter: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-demo-counter @@ -1022,34 +1001,13 @@ opam:tezos-client-genesis: variables: package: tezos-client-genesis -opam:tezos-context: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-context - opam:tezos-context-ops: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-context-ops -opam:tezos-crypto: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-crypto - -opam:tezos-crypto-dal: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-crypto-dal - opam:tezos-dac-017-PtNairob: extends: - .opam_template @@ -1114,7 +1072,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 @@ -1128,119 +1086,119 @@ opam:tezos-embedded-protocol-000-Ps9mPmXa: opam:tezos-embedded-protocol-001-PtCJ7pwo: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-001-PtCJ7pwo opam:tezos-embedded-protocol-002-PsYLVpVv: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-002-PsYLVpVv opam:tezos-embedded-protocol-003-PsddFKi3: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-003-PsddFKi3 opam:tezos-embedded-protocol-004-Pt24m4xi: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-004-Pt24m4xi opam:tezos-embedded-protocol-005-PsBABY5H: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-005-PsBABY5H opam:tezos-embedded-protocol-005-PsBabyM1: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-005-PsBabyM1 opam:tezos-embedded-protocol-006-PsCARTHA: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-006-PsCARTHA opam:tezos-embedded-protocol-007-PsDELPH1: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-007-PsDELPH1 opam:tezos-embedded-protocol-008-PtEdo2Zk: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-008-PtEdo2Zk opam:tezos-embedded-protocol-008-PtEdoTez: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-008-PtEdoTez opam:tezos-embedded-protocol-009-PsFLoren: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-009-PsFLoren opam:tezos-embedded-protocol-010-PtGRANAD: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-010-PtGRANAD opam:tezos-embedded-protocol-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-011-PtHangz2 opam:tezos-embedded-protocol-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-012-Psithaca opam:tezos-embedded-protocol-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-013-PtJakart opam:tezos-embedded-protocol-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-014-PtKathma opam:tezos-embedded-protocol-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-015-PtLimaPt @@ -1293,49 +1251,21 @@ opam:tezos-embedded-protocol-genesis: variables: package: tezos-embedded-protocol-genesis -opam:tezos-error-monad: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-error-monad - -opam:tezos-event-logging: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-event-logging - -opam:tezos-event-logging-test-helpers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-event-logging-test-helpers - # Ignoring unreleased package tezos-expect-helper. opam:tezos-gossipsub: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-gossipsub # Ignoring unreleased package tezos-gossipsub-test. -opam:tezos-hacl: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-hacl - 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 @@ -1362,13 +1292,6 @@ opam:tezos-layer2-utils-018-Proxford: # Ignoring unreleased package tezos-layer2-utils-alpha. -opam:tezos-lazy-containers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-lazy-containers - # Ignoring unreleased package tezos-lazy-containers-tests. opam:tezos-lwt-result-stdlib: @@ -1378,19 +1301,12 @@ opam:tezos-lwt-result-stdlib: variables: package: tezos-lwt-result-stdlib -opam:tezos-micheline: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-micheline - # Ignoring unreleased package tezos-micheline-rewriting. opam:tezos-mockup: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-mockup @@ -1417,20 +1333,6 @@ opam:tezos-mockup-registration: # Ignoring unreleased package tezos-openapi. -opam:tezos-p2p: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-p2p - -opam:tezos-p2p-services: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-p2p-services - opam:tezos-protocol-000-Ps9mPmXa: extends: - .opam_template @@ -1476,91 +1378,91 @@ opam:tezos-protocol-005-PsBABY5H: opam:tezos-protocol-005-PsBabyM1: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-005-PsBabyM1 opam:tezos-protocol-006-PsCARTHA: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-006-PsCARTHA opam:tezos-protocol-007-PsDELPH1: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-007-PsDELPH1 opam:tezos-protocol-008-PtEdo2Zk: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-008-PtEdo2Zk opam:tezos-protocol-008-PtEdoTez: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-008-PtEdoTez opam:tezos-protocol-009-PsFLoren: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-009-PsFLoren opam:tezos-protocol-010-PtGRANAD: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-010-PtGRANAD opam:tezos-protocol-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-011-PtHangz2 opam:tezos-protocol-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .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_5 + - .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_5 + - .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_5 + - .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_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-016-PtMumbai @@ -1569,7 +1471,7 @@ opam:tezos-protocol-016-PtMumbai: opam:tezos-protocol-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-017-PtNairob @@ -1578,7 +1480,7 @@ opam:tezos-protocol-017-PtNairob: opam:tezos-protocol-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-018-Proxford @@ -1587,7 +1489,7 @@ opam:tezos-protocol-018-Proxford: opam:tezos-protocol-alpha: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-alpha @@ -1624,63 +1526,63 @@ opam:tezos-protocol-genesis: opam:tezos-protocol-plugin-007-PsDELPH1: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-007-PsDELPH1 opam:tezos-protocol-plugin-007-PsDELPH1-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-007-PsDELPH1-registerer opam:tezos-protocol-plugin-008-PtEdo2Zk: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-008-PtEdo2Zk opam:tezos-protocol-plugin-008-PtEdo2Zk-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-008-PtEdo2Zk-registerer opam:tezos-protocol-plugin-009-PsFLoren: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-009-PsFLoren opam:tezos-protocol-plugin-009-PsFLoren-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-009-PsFLoren-registerer opam:tezos-protocol-plugin-010-PtGRANAD: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-010-PtGRANAD opam:tezos-protocol-plugin-010-PtGRANAD-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-010-PtGRANAD-registerer opam:tezos-protocol-plugin-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-011-PtHangz2 @@ -1694,7 +1596,7 @@ opam:tezos-protocol-plugin-011-PtHangz2-registerer: opam:tezos-protocol-plugin-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-012-Psithaca @@ -1708,7 +1610,7 @@ opam:tezos-protocol-plugin-012-Psithaca-registerer: opam:tezos-protocol-plugin-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-013-PtJakart @@ -1722,7 +1624,7 @@ opam:tezos-protocol-plugin-013-PtJakart-registerer: opam:tezos-protocol-plugin-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-014-PtKathma @@ -1828,56 +1730,21 @@ opam:tezos-proxy: opam:tezos-proxy-server-config: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-proxy-server-config opam:tezos-requester: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-requester - -opam:tezos-rpc: extends: - .opam_template - .rules_template__trigger_all_opam_batch_7 variables: - package: tezos-rpc - -opam:tezos-rpc-http: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-rpc-http - -opam:tezos-rpc-http-client: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-rpc-http-client - -opam:tezos-rpc-http-client-unix: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-rpc-http-client-unix - -opam:tezos-rpc-http-server: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-rpc-http-server + package: tezos-requester opam:tezos-sapling: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-sapling @@ -1917,7 +1784,7 @@ opam:tezos-scoru-wasm-helpers: opam:tezos-shell: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-shell @@ -1932,13 +1799,6 @@ opam:tezos-shell-context: # Ignoring unreleased package tezos-shell-context-test. -opam:tezos-shell-services: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-shell-services - opam:tezos-signer-backends: extends: - .opam_template @@ -2004,20 +1864,6 @@ opam:tezos-smart-rollup-layer2-018-Proxford: # Ignoring unreleased package tezos-smart-rollup-layer2-alpha. -opam:tezos-stdlib: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-stdlib - -opam:tezos-stdlib-unix: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-stdlib-unix - opam:tezos-store: extends: - .opam_template @@ -2036,19 +1882,12 @@ opam:tezos-test-helpers: # Ignoring unreleased package tezos-tps-evaluation. -opam:tezos-tree-encoding: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-tree-encoding - # Ignoring unreleased package tezos-tree-encoding-test. opam:tezos-validation: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-validation @@ -2069,7 +1908,7 @@ opam:tezos-wasmer: opam:tezos-webassembly-interpreter: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-webassembly-interpreter @@ -2080,13 +1919,6 @@ opam:tezos-webassembly-interpreter-extra: variables: package: tezos-webassembly-interpreter-extra -opam:tezos-workers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-workers - # Ignoring unreleased package tezt-ethereum. opam:tezt-performance-regression: @@ -2095,10 +1927,3 @@ opam:tezt-performance-regression: - .rules_template__trigger_all_opam_batch_7 variables: package: tezt-performance-regression - -opam:tezt-tezos: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezt-tezos diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index df6a3516f987..27c88408ad2a 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -4,8 +4,8 @@ (library (name get_contracts_lib) (libraries - tezos-micheline - tezos-base + octez-libs.tezos-micheline + octez-libs.tezos-base tezos-store tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai @@ -25,8 +25,8 @@ (executable (name get_contracts) (libraries - tezos-micheline - tezos-base + octez-libs.tezos-micheline + octez-libs.tezos-base get_contracts_lib) (link_flags (:standard) diff --git a/devtools/tztop/dune b/devtools/tztop/dune index ad48aaddc4a1..640b96032f49 100644 --- a/devtools/tztop/dune +++ b/devtools/tztop/dune @@ -8,6 +8,6 @@ (modes byte) (libraries octez-protocol-compiler - tezos-base + octez-libs.tezos-base compiler-libs.toplevel (select tztop.ml from (utop -> tztop.utop.ml) (-> tztop.vanilla.ml)))) diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 011f980be711..664ac553a613 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -4,13 +4,13 @@ (library (name yes_wallet_lib) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix lwt.unix ezjsonm tezos-store tezos-shell-context - tezos-context + octez-libs.tezos-context tezos-protocol-016-PtMumbai tezos-protocol-017-PtNairob tezos-protocol-018-Proxford diff --git a/devtools/yes_wallet/test/dune b/devtools/yes_wallet/test/dune index 7fe86b7f0bb9..8f2efda82bb8 100644 --- a/devtools/yes_wallet/test/dune +++ b/devtools/yes_wallet/test/dune @@ -4,8 +4,8 @@ (executable (name bench_signature_perf) (libraries - tezos-error-monad - tezos-crypto + octez-libs.tezos-error-monad + octez-libs.tezos-crypto zarith zarith_stubs_js data-encoding diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 77c19ab5b673..72d85e7167be 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -1,11 +1,11 @@ (executables (names rpc_doc p2p_doc) - (libraries tezos-base - tezos-rpc - tezos-stdlib-unix + (libraries octez-libs.tezos-base + octez-libs.tezos-rpc + octez-libs.tezos-stdlib-unix tezos-shell - tezos-rpc-http-server + octez-libs.tezos-rpc-http-server tezos-protocol-updater ; TODO tezos/tezos#2170: adapt next line(s) tezos-embedded-protocol-genesis diff --git a/dune-project b/dune-project index b03862592c4f..fd1616f74bd4 100644 --- a/dune-project +++ b/dune-project @@ -15,7 +15,6 @@ (package (name octez-baker-PtNairob)) (package (name octez-baker-alpha)) (package (name octez-bls12-381-hash)) -(package (name octez-bls12-381-polynomial)) (package (name octez-bls12-381-signature)) (package (name octez-client)) (package (name octez-codec)) @@ -32,12 +31,12 @@ (package (name octez-evm-proxy-lib)(allow_empty)) (package (name octez-evm-upgrade-signer)(allow_empty)) (package (name octez-injector)) +(package (name octez-libs)) (package (name octez-mec)) (package (name octez-node)) (package (name octez-node-config)) (package (name octez-plompiler)) (package (name octez-plonk)) -(package (name octez-polynomial)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) (package (name octez-signer)) @@ -74,8 +73,6 @@ (package (name tezos-baking-018-Proxford-commands)) (package (name tezos-baking-alpha)) (package (name tezos-baking-alpha-commands)) -(package (name tezos-base)) -(package (name tezos-base-test-helpers)) (package (name tezos-benchmark)) (package (name tezos-benchmark-016-PtMumbai)) (package (name tezos-benchmark-017-PtNairob)) @@ -117,10 +114,7 @@ (package (name tezos-client-commands)) (package (name tezos-client-demo-counter)) (package (name tezos-client-genesis)) -(package (name tezos-context)) (package (name tezos-context-ops)) -(package (name tezos-crypto)) -(package (name tezos-crypto-dal)) (package (name tezos-dac-017-PtNairob)) (package (name tezos-dac-018-Proxford)) (package (name tezos-dac-alpha)) @@ -160,30 +154,22 @@ (package (name tezos-embedded-protocol-demo-counter)) (package (name tezos-embedded-protocol-demo-noops)) (package (name tezos-embedded-protocol-genesis)) -(package (name tezos-error-monad)) -(package (name tezos-event-logging)) -(package (name tezos-event-logging-test-helpers)) (package (name tezos-expect-helper)) (package (name tezos-gossipsub)) (package (name tezos-gossipsub-test)(allow_empty)) -(package (name tezos-hacl)) (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)) (package (name tezos-layer2-utils-alpha)) -(package (name tezos-lazy-containers)) (package (name tezos-lazy-containers-tests)(allow_empty)) (package (name tezos-lwt-result-stdlib)) -(package (name tezos-micheline)) (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-p2p)) -(package (name tezos-p2p-services)) (package (name tezos-protocol-000-Ps9mPmXa)) (package (name tezos-protocol-001-PtCJ7pwo)) (package (name tezos-protocol-002-PsYLVpVv)) @@ -248,11 +234,6 @@ (package (name tezos-proxy)) (package (name tezos-proxy-server-config)) (package (name tezos-requester)) -(package (name tezos-rpc)) -(package (name tezos-rpc-http)) -(package (name tezos-rpc-http-client)) -(package (name tezos-rpc-http-client-unix)) -(package (name tezos-rpc-http-server)) (package (name tezos-sapling)) (package (name tezos-sc-rollup-node-test)(allow_empty)) (package (name tezos-scoru-wasm)) @@ -267,7 +248,6 @@ (package (name tezos-shell-benchmarks)) (package (name tezos-shell-context)) (package (name tezos-shell-context-test)(allow_empty)) -(package (name tezos-shell-services)) (package (name tezos-signer-backends)) (package (name tezos-signer-services)) (package (name tezos-smart-rollup-016-PtMumbai)) @@ -278,22 +258,17 @@ (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-stdlib)) -(package (name tezos-stdlib-unix)) (package (name tezos-store)) (package (name tezos-test-helpers)) (package (name tezos-tooling)) (package (name tezos-tps-evaluation)) -(package (name tezos-tree-encoding)) (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)) (package (name tezos-webassembly-interpreter-extra)) -(package (name tezos-workers)) (package (name tezt-ethereum)(allow_empty)) (package (name tezt-performance-regression)) -(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 83fe413effca..e8e9a0f0d8fe 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -577,7 +577,7 @@ let _octez_expect_helper_test = ~inline_tests:ppx_expect let octez_stdlib = - public_lib + octez_lib "tezos-stdlib" ~path:"src/lib_stdlib" ~synopsis:"Tezos: yet-another local-extension of the OCaml standard library" @@ -603,7 +603,7 @@ let _octez_stdlib_tests = ] ~path:"src/lib_stdlib/test" ~with_macos_security_framework:true - ~opam:"tezos-stdlib" + ~opam:"octez-libs" ~modes:[Native; JS] ~deps: [ @@ -624,7 +624,7 @@ let _octez_stdlib_test_unix = "test_hash_queue_lwt"; ] ~path:"src/lib_stdlib/test-unix" - ~opam:"tezos-stdlib" + ~opam:"octez-libs" ~deps: [ octez_stdlib |> open_; @@ -759,7 +759,7 @@ let _octez_lwt_result_stdlib_tests = ~opam_with_test:Only_on_64_arch let octez_error_monad = - public_lib + octez_lib "tezos-error-monad" ~path:"src/lib_error_monad" ~synopsis:"Tezos: error monad" @@ -778,7 +778,7 @@ let octez_hacl = let js_stubs = ["random.js"; "evercrypt.js"] in let js_generated = "runtime-generated.js" in let js_helper = "helper.js" in - public_lib + octez_lib "tezos-hacl" ~path:"src/lib_hacl" ~synopsis:"Tezos: thin layer around hacl-star" @@ -823,7 +823,7 @@ let _octez_hacl_gen0 = private_exe "gen0" ~path:"src/lib_hacl/gen/" - ~opam:"tezos-hacl" + ~opam:"octez-libs" ~with_macos_security_framework:true ~bisect_ppx:No ~modules:["gen0"] @@ -833,12 +833,12 @@ let _octez_hacl_gen = private_exe "gen" ~path:"src/lib_hacl/gen/" - ~opam:"tezos-hacl" + ~opam:"octez-libs" ~bisect_ppx:No ~deps:[ctypes_stubs; ctypes; hacl_star_raw; ezjsonm] ~modules:["gen"; "bindings"; "api_json"] ~dune: - (let package = "tezos-hacl" in + (let package = "octez-libs" in Dune. [ targets_rule @@ -886,7 +886,7 @@ let _octez_hacl_tests = "vectors_ed25519"; ] ~path:"src/lib_hacl/test" - ~opam:"tezos-hacl" + ~opam:"octez-libs" ~deps: [ octez_stdlib |> open_; @@ -908,13 +908,13 @@ let _octez_error_monad_tests = ["test_registration"; "test_splitted_error_encoding"] ~path:"src/lib_error_monad/test" ~with_macos_security_framework:true - ~opam:"tezos-error-monad" + ~opam:"octez-libs" ~modes:[Native; JS] ~deps:[octez_error_monad |> open_; data_encoding; alcotezt] ~js_compatible:true let octez_rpc = - public_lib + octez_lib "tezos-rpc" ~path:"src/lib_rpc" ~synopsis: @@ -1210,7 +1210,7 @@ let _octez_bls12_381_signature_gen_wasm_needed_names = ~deps:[re] let octez_crypto = - public_lib + octez_lib "tezos-crypto" ~path:"src/lib_crypto" ~synopsis: @@ -1253,7 +1253,7 @@ let _octez_crypto_tests = "vectors_secp256k1_keccak256"; ] ~path:"src/lib_crypto/test" - ~opam:"tezos-crypto" + ~opam:"octez-libs" ~deps: [ octez_stdlib |> open_; @@ -1274,7 +1274,7 @@ let _octez_crypto_tests_unix = tezt ["test_crypto_box"] ~path:"src/lib_crypto/test-unix" - ~opam:"tezos-crypto" + ~opam:"octez-libs" ~deps: [ octez_stdlib |> open_; @@ -1401,7 +1401,7 @@ let _octez_mec_tests = ~deps:[alcotezt; octez_mec |> open_] let octez_polynomial = - public_lib + octez_lib "octez-polynomial" ~path:"src/lib_polynomial" ~internal_name:"polynomial" @@ -1412,11 +1412,11 @@ let _octez_polynomial_tests = tezt ["test_with_finite_field"; "test_utils"; "polynomial_pbt"] ~path:"src/lib_polynomial/test" - ~opam:"octez-polynomial" + ~opam:"octez-libs" ~deps:[bls12_381; octez_mec; alcotezt; octez_polynomial] let octez_bls12_381_polynomial = - public_lib + octez_lib "octez-bls12-381-polynomial" ~path:"src/lib_bls12_381_polynomial" ~synopsis: @@ -1454,7 +1454,7 @@ let _octez_bls12_381_polynomial_tests = "test_srs"; ] ~path:"src/lib_bls12_381_polynomial/test" - ~opam:"octez-bls12-381-polynomial" + ~opam:"octez-libs" ~deps: [ alcotezt; @@ -1869,18 +1869,17 @@ let _octez_epoxy_tx_tests = ~dune:(make_plonk_runtest_invocation ~package:"octez-epoxy-tx") let octez_dal_config = - public_lib + octez_lib "tezos-crypto-dal.octez-dal-config" ~path:"src/lib_crypto_dal/dal_config" ~deps:[data_encoding |> open_] ~js_compatible:true let octez_crypto_dal = - public_lib + octez_lib "tezos-crypto-dal" ~path:"src/lib_crypto_dal" ~synopsis:"DAL cryptographic primitives" - ~opam:"tezos-crypto-dal" ~deps: [ octez_stdlib |> open_; @@ -1896,7 +1895,7 @@ let _octez_crypto_dal_tests = tezt ["test_dal_cryptobox"] ~path:"src/lib_crypto_dal/test" - ~opam:"tezos-crypto-dal" + ~opam:"octez-libs" ~dep_files:["srs_zcash_g1_5"; "srs_zcash_g2_5"] ~deps: [ @@ -1912,7 +1911,7 @@ let _octez_crypto_dal_tests = ] let octez_event_logging = - public_lib + octez_lib "tezos-event-logging" ~path:"src/lib_event_logging" ~synopsis:"Tezos event logging library" @@ -1927,7 +1926,7 @@ let octez_event_logging = ~js_compatible:true let octez_event_logging_test_helpers = - public_lib + octez_lib "tezos-event-logging-test-helpers" ~path:"src/lib_event_logging/test_helpers" ~synopsis:"Tezos: test helpers for the event logging library" @@ -1946,7 +1945,7 @@ let octez_event_logging_test_helpers = ~bisect_ppx:No let octez_stdlib_unix = - public_lib + octez_lib "tezos-stdlib-unix" ~path:"src/lib_stdlib_unix" ~synopsis: @@ -1977,7 +1976,7 @@ let _octez_stdlib_unix_test = tezt ["test_key_value_store_fuzzy"; "test_log_config_rules"] ~path:"src/lib_stdlib_unix/test/" - ~opam:"tezos-stdlib-unix" + ~opam:"octez-libs" ~deps: [ octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; @@ -2034,7 +2033,7 @@ let _octez_clic_example = ~static:false let octez_micheline = - public_lib + octez_lib "tezos-micheline" ~path:"src/lib_micheline" ~synopsis:"Tezos: internal AST and parser for the Michelson language" @@ -2054,7 +2053,7 @@ let _octez_micheline_tests = private_lib "test_parser" ~path:"src/lib_micheline/test" - ~opam:"tezos-micheline" + ~opam:"octez-libs" ~inline_tests:ppx_expect ~modules:["test_parser"] ~deps:[octez_micheline |> open_] @@ -2064,14 +2063,14 @@ let _octez_micheline_tests = private_lib "test_diff" ~path:"src/lib_micheline/test" - ~opam:"tezos-micheline" + ~opam:"octez-libs" ~inline_tests:ppx_expect ~modules:["test_diff"] ~deps:[octez_micheline |> open_] ~js_compatible:true let octez_base = - public_lib + octez_lib "tezos-base" ~path:"src/lib_base" ~synopsis:"Tezos: meta-package and pervasive type definitions for Tezos" @@ -2092,10 +2091,11 @@ let octez_base = uri; ] ~js_compatible:true + ~documentation:[Dune.[S "package"; S "octez-libs"]] ~dune:Dune.[ocamllex "point_parser"] let octez_base_unix = - public_lib + octez_lib "tezos-base.unix" ~path:"src/lib_base/unix" ~deps: @@ -2113,7 +2113,7 @@ let octez_base_unix = ~inline_tests:ppx_expect let octez_base_p2p_identity_file = - public_lib + octez_lib "tezos-base.p2p-identity-file" ~path:"src/lib_base/p2p_identity_file" ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_stdlib_unix |> open_] @@ -2129,7 +2129,7 @@ let _octez_base_tests = "test_skip_list"; ] ~path:"src/lib_base/test" - ~opam:"tezos-base" + ~opam:"octez-libs" ~deps: [ octez_base |> open_; @@ -2153,7 +2153,7 @@ let _octez_base_unix_tests = ["test_unix_error"; "test_syslog"] ~path:"src/lib_base/unix/test" ~with_macos_security_framework:true - ~opam:"tezos-base" + ~opam:"octez-libs" ~modes:[Native] ~deps: [ @@ -2169,7 +2169,7 @@ let _octez_base_unix_tests = ] let octez_base_test_helpers = - public_lib + octez_lib "tezos-base-test-helpers" ~path:"src/lib_base/test_helpers" ~synopsis:"Tezos: Tezos base test helpers" @@ -2188,15 +2188,14 @@ let octez_base_test_helpers = ~release_status:Released let octez_context_sigs = - public_lib + octez_lib "tezos-context.sigs" ~path:"src/lib_context/sigs" - ~opam:"tezos-context" ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_stdlib |> open_] ~js_compatible:true let tree_encoding = - public_lib + octez_lib "tezos-tree-encoding" ~path:"src/lib_tree_encoding" ~synopsis: @@ -2210,7 +2209,7 @@ let tree_encoding = ] let lazy_containers = - public_lib + octez_lib "tezos-lazy-containers" ~path:"src/lib_lazy_containers" ~synopsis: @@ -2291,7 +2290,7 @@ let _octez_webassembly_test = ~deps:[octez_webassembly_interpreter |> open_; alcotezt] let octez_version_parser = - public_lib + octez_lib "tezos-version.parser" ~path:"src/lib_version/parser" ~dune:Dune.[ocamllex "tezos_version_parser"] @@ -2299,7 +2298,7 @@ let octez_version_parser = ~preprocess:[pps ppx_deriving_show] let octez_version = - public_lib + octez_lib "tezos-version" ~path:"src/lib_version" ~synopsis:"Tezos: version information generated from Git" @@ -2310,6 +2309,7 @@ let octez_version_value = public_lib "tezos-version.value" ~path:"src/lib_version/value/" + ~synopsis:"Tezos: version value generated from Git" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2355,13 +2355,13 @@ let _octez_version_tests = tezt ["test_parser"] ~path:"src/lib_version/test" - ~opam:"tezos-version" + ~opam:"octez-libs" ~js_compatible:true ~modes:[Native; JS] ~deps:[octez_version |> open_; octez_version_parser; alcotezt] let octez_p2p_services = - public_lib + octez_lib "tezos-p2p-services" ~path:"src/lib_p2p_services" ~synopsis:"Tezos: descriptions of RPCs exported by `tezos-p2p`" @@ -2370,13 +2370,12 @@ let octez_p2p_services = ~js_compatible:true let octez_workers = - public_lib + octez_lib "tezos-workers" ~path:"src/lib_workers" ~synopsis:"Tezos: worker library" ~documentation: - Dune. - [[S "package"; S "tezos-workers"]; [S "mld_files"; S "tezos_workers"]] + Dune.[[S "package"; S "octez-libs"]; [S "mld_files"; S "tezos_workers"]] ~deps: [ octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -2387,7 +2386,7 @@ let _octez_workers_tests = tezt ["mocked_worker"; "test_workers_unit"] ~path:"src/lib_workers/test" - ~opam:"tezos-workers" + ~opam:"octez-libs" ~deps: [ octez_stdlib |> open_; @@ -2401,7 +2400,7 @@ let _octez_workers_tests = ] let octez_merkle_proof_encoding = - public_lib + octez_lib "tezos-context.merkle_proof_encoding" ~path:"src/lib_context/merkle_proof_encoding" ~deps: @@ -2413,7 +2412,7 @@ let octez_merkle_proof_encoding = ~js_compatible:true let octez_shell_services = - public_lib + octez_lib "tezos-shell-services" ~path:"src/lib_shell_services" ~synopsis:"Tezos: descriptions of RPCs exported by `tezos-shell`" @@ -2434,7 +2433,7 @@ let _octez_shell_services_tests = tezt ["test_block_services"] ~path:"src/lib_shell_services/test" - ~opam:"tezos-shell-services" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2476,7 +2475,7 @@ let _octez_tooling_opam_lint = ~deps:[octez_tooling_opam_file_format; unix] let octez_p2p = - public_lib + octez_lib "tezos-p2p" ~path:"src/lib_p2p" ~synopsis:"Tezos: library for a pool of P2P connections" @@ -2505,7 +2504,7 @@ let tezt_performance_regression = ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; uri; cohttp_lwt_unix] let tezt_tezos = - public_lib + octez_lib "tezt-tezos" ~path:"tezt/lib_tezos" ~synopsis:"Tezos test framework based on Tezt" @@ -2524,32 +2523,10 @@ let tezt_tezos = ~cram:true ~release_status:Released -let tezt_ethereum = - private_lib - "tezt_ethereum" - ~path:"tezt/lib_ethereum" - ~opam:"tezt-ethereum" - ~synopsis:"Ethereum test framework based on Tezt" - ~bisect_ppx:No - ~deps: - [ - tezt_lib |> open_ |> open_ ~m:"Base"; - tezt_performance_regression |> open_; - ] - ~release_status:Unreleased - -let _tezt_self_tests = - tezt - ["test_michelson_script"; "test_daemon"] - ~opam:"tezt-tezos" - ~path:"tezt/self_tests" - ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_] - let octez_p2p_test_common = - private_lib + octez_lib "tezos_p2p_test_common" ~path:"src/lib_p2p/test/common" - ~opam:"tezos-p2p" ~deps: [ tezt_lib |> open_ |> open_ ~m:"Base"; @@ -2565,7 +2542,7 @@ let _octez_p2p_tezt = tezt ["test_p2p_socket"; "test_p2p_conn"] ~path:"src/lib_p2p/tezt" - ~opam:"tezos-p2p" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2596,7 +2573,7 @@ let _octez_p2p_tests = ] ~bisect_ppx:With_sigterm ~path:"src/lib_p2p/test" - ~opam:"tezos-p2p" + ~opam:"octez-libs" ~locks:"/locks/p2p" ~deps: [ @@ -2616,6 +2593,27 @@ let _octez_p2p_tests = astring; ] +let tezt_ethereum = + private_lib + "tezt_ethereum" + ~path:"tezt/lib_ethereum" + ~opam:"tezt-ethereum" + ~synopsis:"Ethereum test framework based on Tezt" + ~bisect_ppx:No + ~deps: + [ + tezt_lib |> open_ |> open_ ~m:"Base"; + tezt_performance_regression |> open_; + ] + ~release_status:Unreleased + +let _tezt_self_tests = + tezt + ["test_michelson_script"; "test_daemon"] + ~opam:"octez-libs" + ~path:"tezt/self_tests" + ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_] + let octez_gossipsub = public_lib "tezos-gossipsub" @@ -2683,7 +2681,7 @@ let _octez_wasmer_test = ~deps:[octez_wasmer; alcotezt] let octez_context_encoding = - public_lib + octez_lib "tezos-context.encoding" ~path:"src/lib_context/encoding" ~deps: @@ -2696,7 +2694,7 @@ let octez_context_encoding = ~conflicts:[Conflicts.checkseum] let octez_context_helpers = - public_lib + octez_lib "tezos-context.helpers" ~path:"src/lib_context/helpers" ~deps: @@ -2712,7 +2710,7 @@ let octez_context_helpers = ~conflicts:[Conflicts.checkseum] let octez_context_memory = - public_lib + octez_lib "tezos-context.memory" ~path:"src/lib_context/memory" ~deps: @@ -2761,14 +2759,14 @@ let octez_scoru_wasm_fast = ] let octez_context_dump = - public_lib + octez_lib "tezos-context.dump" ~path:"src/lib_context/dump" ~deps: [octez_base |> open_ ~m:"TzPervasives"; octez_stdlib_unix |> open_; fmt] let octez_context_disk = - public_lib + octez_lib "tezos-context.disk" ~path:"src/lib_context/disk" ~deps: @@ -2810,7 +2808,7 @@ let _tree_encoding_tests = ] let octez_context = - public_lib + octez_lib "tezos-context" ~path:"src/lib_context" ~synopsis:"Tezos: on-disk context abstraction for `octez-node`" @@ -2820,7 +2818,7 @@ let _octez_context_tests = tezt ["test_context"; "test_merkle_proof"] ~path:"src/lib_context/test" - ~opam:"tezos-context" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2839,7 +2837,7 @@ let _octez_context_memory_tests = tezt ["test"] ~path:"src/lib_context/memory/test" - ~opam:"tezos-context" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3528,7 +3526,7 @@ let octez_shell = ] let octez_rpc_http = - public_lib + octez_lib "tezos-rpc-http" ~path:"src/lib_rpc_http" ~synopsis:"Tezos: library of auto-documented RPCs (http server and client)" @@ -3536,7 +3534,7 @@ let octez_rpc_http = ~modules:["RPC_client_errors"; "media_type"] let octez_rpc_http_client = - public_lib + octez_lib "tezos-rpc-http-client" ~path:"src/lib_rpc_http" ~synopsis:"Tezos: library of auto-documented RPCs (http client)" @@ -3550,7 +3548,7 @@ let octez_rpc_http_client = ~modules:["RPC_client"] let octez_rpc_http_client_unix = - public_lib + octez_lib "tezos-rpc-http-client-unix" ~path:"src/lib_rpc_http" ~synopsis:"Tezos: unix implementation of the RPC client" @@ -3566,7 +3564,7 @@ let octez_rpc_http_client_unix = ~modules:["RPC_client_unix"] let octez_rpc_http_server = - public_lib + octez_lib "tezos-rpc-http-server" ~path:"src/lib_rpc_http" ~synopsis:"Tezos: library of auto-documented RPCs (http server)" @@ -3586,7 +3584,7 @@ let _octez_rpc_http_server_tests = tezt ["test_rpc_http"] ~path:"src/lib_rpc_http/test" - ~opam:"tezos-rpc-http-server" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; diff --git a/opam/internal-devtools.opam b/opam/internal-devtools.opam index 3a46bd717e90..d727574fbb3f 100644 --- a/opam/internal-devtools.opam +++ b/opam/internal-devtools.opam @@ -13,7 +13,7 @@ depends: [ "num" "re" { >= "1.9.0" } "octez-protocol-compiler" - "tezos-base" + "octez-libs" ] depopts: [ "utop" diff --git a/opam/octez-accuser-Proxford.opam b/opam/octez-accuser-Proxford.opam index 5e0eaf9858c7..8aadfa8cea80 100644 --- a/opam/octez-accuser-Proxford.opam +++ b/opam/octez-accuser-Proxford.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" "tezos-client-commands" "tezos-baking-018-Proxford-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-accuser-PtMumbai.opam b/opam/octez-accuser-PtMumbai.opam index 84316b58dc01..293c73903e83 100644 --- a/opam/octez-accuser-PtMumbai.opam +++ b/opam/octez-accuser-PtMumbai.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-016-PtMumbai" "tezos-client-016-PtMumbai" "tezos-client-commands" "tezos-baking-016-PtMumbai-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam index 27222e7977b5..01723b8b52f6 100644 --- a/opam/octez-accuser-PtNairob.opam +++ b/opam/octez-accuser-PtNairob.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" "tezos-client-commands" "tezos-baking-017-PtNairob-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 547db13989a7..5de99b33dd15 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" "tezos-baking-alpha-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-baker-Proxford.opam b/opam/octez-baker-Proxford.opam index 269dac2e04e4..299ede470355 100644 --- a/opam/octez-baker-Proxford.opam +++ b/opam/octez-baker-Proxford.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" "tezos-client-commands" "tezos-baking-018-Proxford-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-baker-PtMumbai.opam b/opam/octez-baker-PtMumbai.opam index 48a9d1bc7a9d..c1cc6f25225d 100644 --- a/opam/octez-baker-PtMumbai.opam +++ b/opam/octez-baker-PtMumbai.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-016-PtMumbai" "tezos-client-016-PtMumbai" "tezos-client-commands" "tezos-baking-016-PtMumbai-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam index 798da530c1ab..d8f8fca7d721 100644 --- a/opam/octez-baker-PtNairob.opam +++ b/opam/octez-baker-PtNairob.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" "tezos-client-commands" "tezos-baking-017-PtNairob-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index 5e6bb665ecbc..14381842e743 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -10,13 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" "tezos-baking-alpha-commands" - "tezos-stdlib-unix" "tezos-client-base-unix" ] build: [ diff --git a/opam/octez-bls12-381-polynomial.opam b/opam/octez-bls12-381-polynomial.opam deleted file mode 100644 index 9e3900dde41c..000000000000 --- a/opam/octez-bls12-381-polynomial.opam +++ /dev/null @@ -1,26 +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_repr" { >= "0.6.0" } - "bls12-381" - "bigstringaf" { >= "0.5.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-polynomial" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Polynomials over BLS12-381 finite field - Temporary vendored version of Octez" diff --git a/opam/octez-client.opam b/opam/octez-client.opam index 3f16aa021b67..98e5e96bb80b 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -10,11 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-rpc-http-client" - "tezos-stdlib-unix" - "tezos-shell-services" "tezos-client-base" "tezos-client-commands" "tezos-mockup-commands" diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 8d6dcbeb40bf..0c7332c46b47 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-base" + "octez-libs" "tezos-client-base-unix" "tezos-client-base" "tezos-clic" - "tezos-stdlib-unix" - "tezos-event-logging" "tezos-signer-services" "tezos-version" ] diff --git a/opam/octez-crawler.opam b/opam/octez-crawler.opam index ee31a070bf4f..2e857feeec5a 100644 --- a/opam/octez-crawler.opam +++ b/opam/octez-crawler.opam @@ -10,9 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-rpc-http" - "tezos-stdlib-unix" + "octez-libs" "tezos-client-base" "tezos-shell" ] diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam index 9c2daffebde0..70f8b4beb9f8 100644 --- a/opam/octez-dac-client.opam +++ b/opam/octez-dac-client.opam @@ -10,13 +10,11 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" - "tezos-stdlib-unix" - "tezos-stdlib" "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 e786466feb46..43285da97e84 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" - "tezos-rpc-http" - "tezos-rpc-http-server" "tezos-protocol-updater" - "tezos-rpc-http-client-unix" - "tezos-stdlib-unix" - "tezos-stdlib" "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 5c5716ba2328..0f2387b6c2e7 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -10,28 +10,17 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-version" + "octez-libs" "cmdliner" { >= "1.1.0" } "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" - "tezos-rpc-http" - "tezos-rpc-http-server" "tezos-protocol-updater" - "tezos-rpc-http-client-unix" - "tezos-stdlib-unix" - "tezos-stdlib" "tezos-dal-node-lib" "tezos-dal-node-services" "tezos-layer2-store" - "tezos-crypto-dal" "tezos-store" "tezos-gossipsub" - "tezos-p2p" - "tezos-p2p-services" - "tezos-crypto" - "tezos-shell-services" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "prometheus-app" { >= "1.2" } diff --git a/opam/octez-evm-chunker.opam b/opam/octez-evm-chunker.opam index 6e8269ac529c..29f6b262dc65 100644 --- a/opam/octez-evm-chunker.opam +++ b/opam/octez-evm-chunker.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "octez-evm-proxy-lib" ] build: [ diff --git a/opam/octez-evm-proxy-lib.opam b/opam/octez-evm-proxy-lib.opam index f8831956c0c2..7e3488607f22 100644 --- a/opam/octez-evm-proxy-lib.opam +++ b/opam/octez-evm-proxy-lib.opam @@ -10,9 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-rpc-http" - "tezos-rpc-http-client-unix" + "octez-libs" "tezos-version" "lwt-exit" "rlp" { >= "0.1" } diff --git a/opam/octez-evm-proxy.opam b/opam/octez-evm-proxy.opam index 16ad3697becd..71f9148655bb 100644 --- a/opam/octez-evm-proxy.opam +++ b/opam/octez-evm-proxy.opam @@ -10,10 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-rpc-http" - "tezos-rpc-http-server" "tezos-version" "octez-evm-proxy-lib" ] diff --git a/opam/octez-evm-upgrade-signer.opam b/opam/octez-evm-upgrade-signer.opam index 28cdfc0e4798..f2e496cbdf3a 100644 --- a/opam/octez-evm-upgrade-signer.opam +++ b/opam/octez-evm-upgrade-signer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "octez-evm-proxy-lib" ] diff --git a/opam/octez-injector.opam b/opam/octez-injector.opam index 9301e2d7676f..05b1a0389e65 100644 --- a/opam/octez-injector.opam +++ b/opam/octez-injector.opam @@ -10,13 +10,9 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "logs" - "tezos-stdlib-unix" - "tezos-crypto" - "tezos-micheline" "tezos-client-base" - "tezos-workers" "tezos-shell" "octez-crawler" ] diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam new file mode 100644 index 000000000000..26f6a0a39e6f --- /dev/null +++ b/opam/octez-libs.opam @@ -0,0 +1,75 @@ +# 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" + "hex" { >= "1.3.0" } + "zarith" { >= "1.12" & < "1.13" } + "zarith_stubs_js" + "lwt" { >= "5.6.0" } + "aches" { >= "1.0.0" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "lwt-canceler" { >= "0.3" & < "0.4" } + "tezos-lwt-result-stdlib" + "hacl-star" { >= "0.7.1" & < "0.8" } + "hacl-star-raw" + "ctypes_stubs_js" + "ctypes" { >= "0.18.0" } + "ezjsonm" { >= "1.1.0" } + "resto" { >= "1.2" } + "resto-directory" { >= "1.2" } + "uri" { >= "3.1.0" } + "secp256k1-internal" { >= "0.4.0" } + "bls12-381" + "octez-bls12-381-signature" + "ppx_repr" { >= "0.6.0" } + "bigstringaf" { >= "0.5.0" } + "tezos-test-helpers" + "octez-alcotezt" + "base-unix" + "aches-lwt" { >= "1.0.0" } + "ipaddr" { >= "5.0.0" & < "6.0.0" } + "re" { >= "1.9.0" } + "ptime" { >= "1.1.0" } + "mtime" { >= "1.4.0" & < "2.0.0" } + "conf-libev" + "uutf" + "qcheck-alcotest" { >= "0.20" } + "ppx_deriving" + "lwt-watcher" { = "0.2" } + "ringo" { >= "1.0.0" } + "prometheus" { >= "1.2" } + "tezt" { >= "3.1.1" } + "tezt-performance-regression" + "cohttp-lwt-unix" { >= "5.2.0" } + "astring" {with-test} + "irmin" { >= "3.7.2" & < "3.8.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "fmt" { >= "0.8.7" } + "logs" + "resto-cohttp" { >= "1.2" } + "resto-cohttp-client" { >= "1.2" } + "resto-cohttp-server" { >= "1.2" } + "resto-acl" { >= "1.2" } + "octez-mec" {with-test} + "bigstring" {with-test} +] +conflicts: [ + "checkseum" { = "0.5.0" } + "hacl_x25519" + "result" { < "1.5" } +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Octez libs" diff --git a/opam/octez-node-config.opam b/opam/octez-node-config.opam index 4fa9dc5c1d97..aa0bd99ddbc6 100644 --- a/opam/octez-node-config.opam +++ b/opam/octez-node-config.opam @@ -10,12 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-shell-services" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-context" + "octez-libs" "tezos-store" "tezos-validation" ] diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 98155b9a2f5e..b19a99c2446d 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -10,20 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-version" "octez-node-config" - "tezos-stdlib-unix" - "tezos-shell-services" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-p2p" "tezos-shell" "tezos-store" - "tezos-context" "tezos-validation" "tezos-shell-context" - "tezos-workers" "tezos-protocol-updater" "cmdliner" { >= "1.1.0" } "fmt" { >= "0.8.7" } diff --git a/opam/octez-plompiler.opam b/opam/octez-plompiler.opam index 204ee40eb766..bc28f7683839 100644 --- a/opam/octez-plompiler.opam +++ b/opam/octez-plompiler.opam @@ -16,7 +16,7 @@ depends: [ "stdint" "hacl-star" { >= "0.7.1" & < "0.8" } "octez-bls12-381-hash" - "octez-polynomial" + "octez-libs" "octez-mec" ] build: [ diff --git a/opam/octez-plonk.opam b/opam/octez-plonk.opam index 7b2fa51b03ef..07a7b98fac45 100644 --- a/opam/octez-plonk.opam +++ b/opam/octez-plonk.opam @@ -14,7 +14,7 @@ depends: [ "repr" "hacl-star" { >= "0.7.1" & < "0.8" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "octez-bls12-381-polynomial" + "octez-libs" "octez-plompiler" "logs" "octez-distributed-lwt-internal" diff --git a/opam/octez-polynomial.opam b/opam/octez-polynomial.opam deleted file mode 100644 index 2ec7ecdf4477..000000000000 --- a/opam/octez-polynomial.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" } - "bls12-381" - "zarith" { >= "1.12" & < "1.13" } - "tezt" { with-test & >= "3.1.1" } - "octez-mec" {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: "Polynomials over finite fields" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index 849843862c8c..c916737ef10b 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -10,9 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-environment" - "tezos-stdlib-unix" "lwt" { >= "5.6.0" } "ocp-ocamlres" { >= "0.4" } "base-unix" diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index b12bd61cfe38..2775d97c5b0e 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-rpc" + "octez-libs" "cmdliner" { >= "1.1.0" } "lwt-exit" "lwt" { >= "5.6.0" } "tezos-proxy" "tezos-proxy-server-config" - "tezos-rpc-http-client-unix" - "tezos-rpc-http-server" - "tezos-shell-services" "tezos-shell-context" "tezos-version" "uri" { >= "3.1.0" } diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index c877c73adc97..8c57e94fa9eb 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" "tezos-signer-services" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-rpc-http-client-unix" - "tezos-stdlib-unix" - "tezos-stdlib" "tezos-signer-backends" ] build: [ diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam index 09a96a570d78..135ba07b2700 100644 --- a/opam/octez-smart-rollup-client-Proxford.opam +++ b/opam/octez-smart-rollup-client-Proxford.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-commands" "tezos-client-base" diff --git a/opam/octez-smart-rollup-client-PtMumbai.opam b/opam/octez-smart-rollup-client-PtMumbai.opam index 1d8c0381ee33..20651085c1bd 100644 --- a/opam/octez-smart-rollup-client-PtMumbai.opam +++ b/opam/octez-smart-rollup-client-PtMumbai.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" "tezos-client-commands" "tezos-client-base" diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index f97532643a46..5e6b233aec34 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-commands" "tezos-client-base" diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index 02dd0975ca57..f08808bba370 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-alpha" "tezos-client-commands" "tezos-client-base" diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam index 4454f585f7a0..a0a2ba017c76 100644 --- a/opam/octez-smart-rollup-node-Proxford.opam +++ b/opam/octez-smart-rollup-node-Proxford.opam @@ -10,31 +10,23 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" "tezos-client-018-Proxford" - "tezos-context" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-rpc" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-workers" "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-dac-018-Proxford" "tezos-dac-lib" "tezos-dac-client-lib" - "tezos-shell-services" "octez-smart-rollup" "tezos-smart-rollup-018-Proxford" "tezos-smart-rollup-layer2-018-Proxford" "tezos-layer2-utils-018-Proxford" "tezos-layer2-store" "octez-crawler" - "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } @@ -44,7 +36,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm" "tezos-scoru-wasm-fast" - "tezos-crypto-dal" "tezos-version" "tezos-clic" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam index 8ecb52d72069..624d7af120d5 100644 --- a/opam/octez-smart-rollup-node-PtMumbai.opam +++ b/opam/octez-smart-rollup-node-PtMumbai.opam @@ -10,29 +10,21 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" "tezos-client-016-PtMumbai" - "tezos-context" "tezos-protocol-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" - "tezos-rpc" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-workers" "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-dac-lib" - "tezos-shell-services" "octez-smart-rollup" "tezos-smart-rollup-016-PtMumbai" "tezos-smart-rollup-layer2-016-PtMumbai" "tezos-layer2-utils-016-PtMumbai" "tezos-layer2-store" "octez-crawler" - "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } @@ -42,7 +34,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm" "tezos-scoru-wasm-fast" - "tezos-crypto-dal" "tezos-version" "tezos-clic" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index c1e06755a3e3..4cf66490dff4 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -10,29 +10,21 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" "tezos-client-017-PtNairob" - "tezos-context" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-rpc" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-workers" "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-dac-lib" - "tezos-shell-services" "octez-smart-rollup" "tezos-smart-rollup-017-PtNairob" "tezos-smart-rollup-layer2-017-PtNairob" "tezos-layer2-utils-017-PtNairob" "tezos-layer2-store" "octez-crawler" - "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } @@ -42,7 +34,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm" "tezos-scoru-wasm-fast" - "tezos-crypto-dal" "tezos-version" "tezos-clic" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 07ef110daf6e..1aef3018f27a 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -10,31 +10,23 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" "tezos-client-alpha" - "tezos-context" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-rpc" - "tezos-rpc-http" - "tezos-rpc-http-server" - "tezos-workers" "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-dac-alpha" "tezos-dac-lib" "tezos-dac-client-lib" - "tezos-shell-services" "octez-smart-rollup" "tezos-smart-rollup-alpha" "tezos-smart-rollup-layer2-alpha" "tezos-layer2-utils-alpha" "tezos-layer2-store" "octez-crawler" - "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } @@ -44,7 +36,6 @@ depends: [ "octez-smart-rollup-node-lib" "tezos-scoru-wasm" "tezos-scoru-wasm-fast" - "tezos-crypto-dal" "tezos-version" "tezos-clic" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-node-lib.opam b/opam/octez-smart-rollup-node-lib.opam index 78f2eaa9c811..6cd0d47ac685 100644 --- a/opam/octez-smart-rollup-node-lib.opam +++ b/opam/octez-smart-rollup-node-lib.opam @@ -10,9 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-crypto" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" "cohttp-lwt-unix" { >= "5.2.0" } @@ -25,7 +23,6 @@ depends: [ "tezos-version" "tezos-layer2-store" "octez-crawler" - "tezos-workers" "octez-smart-rollup" ] build: [ diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam index 2c59232452f2..1e04c854d4fc 100644 --- a/opam/octez-smart-rollup-node.opam +++ b/opam/octez-smart-rollup-node.opam @@ -10,9 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-sequencer-node.opam b/opam/octez-smart-rollup-sequencer-node.opam index 2030794637a8..e0fb435b24d1 100644 --- a/opam/octez-smart-rollup-sequencer-node.opam +++ b/opam/octez-smart-rollup-sequencer-node.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-client-base" "tezos-client-base-unix" diff --git a/opam/octez-smart-rollup-sequencer.opam b/opam/octez-smart-rollup-sequencer.opam index 974b5b44db3d..cd3b3d5c4c3e 100644 --- a/opam/octez-smart-rollup-sequencer.opam +++ b/opam/octez-smart-rollup-sequencer.opam @@ -10,16 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-smart-rollup-layer2-alpha" "tezos-protocol-alpha" "octez-smart-rollup-node-alpha" - "tezos-workers" "octez-smart-rollup-node-lib" "octez-smart-rollup" - "tezos-rpc" - "tezos-rpc-http" - "tezos-rpc-http-server" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-wasm-benchmark-lib.opam b/opam/octez-smart-rollup-wasm-benchmark-lib.opam index 50b6358a8c2c..f6bc4dd9fc79 100644 --- a/opam/octez-smart-rollup-wasm-benchmark-lib.opam +++ b/opam/octez-smart-rollup-wasm-benchmark-lib.opam @@ -11,10 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_deriving" - "tezos-base" + "octez-libs" "tezt" { >= "3.1.1" } "tezos-webassembly-interpreter" - "tezos-context" "tezos-scoru-wasm" "tezos-scoru-wasm-helpers" "lwt" { >= "5.6.0" } diff --git a/opam/octez-smart-rollup-wasm-benchmark.opam b/opam/octez-smart-rollup-wasm-benchmark.opam index e74f5dd19bb4..d1dbcad705db 100644 --- a/opam/octez-smart-rollup-wasm-benchmark.opam +++ b/opam/octez-smart-rollup-wasm-benchmark.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_deriving" - "tezos-base" + "octez-libs" "octez-smart-rollup-wasm-benchmark-lib" ] build: [ diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index d2f93a7d6c06..d605050f3ebe 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -10,9 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-tree-encoding" "yaml" { >= "3.1.0" } "tezos-client-alpha" "tezos-scoru-wasm" diff --git a/opam/octez-smart-rollup.opam b/opam/octez-smart-rollup.opam index 83ddb21309a0..5742940456cd 100644 --- a/opam/octez-smart-rollup.opam +++ b/opam/octez-smart-rollup.opam @@ -10,10 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-crypto" - "tezos-crypto-dal" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index 166a919f26eb..6a69654555bc 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -10,8 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "tezos-clic" "tezos-benchmark" "tezos-benchmark-examples" diff --git a/opam/octez-srs-extraction.opam b/opam/octez-srs-extraction.opam index d0eed803b4cf..8cb8af2096b3 100644 --- a/opam/octez-srs-extraction.opam +++ b/opam/octez-srs-extraction.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "bls12-381" - "octez-bls12-381-polynomial" + "octez-libs" "cmdliner" { >= "1.1.0" } "base-unix" "tezt" { with-test & >= "3.1.1" } diff --git a/opam/octez-testnet-scenarios.opam b/opam/octez-testnet-scenarios.opam index 704682067370..9a97127b895e 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" } - "tezt-tezos" + "octez-libs" "tezt-ethereum" ] build: [ diff --git a/opam/scoru-sequencer-test.opam b/opam/scoru-sequencer-test.opam index 312f46e304f8..36037ee5accb 100644 --- a/opam/scoru-sequencer-test.opam +++ b/opam/scoru-sequencer-test.opam @@ -11,10 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} + "octez-libs" {with-test} "tezos-protocol-alpha" {with-test} "octez-smart-rollup-sequencer" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} diff --git a/opam/tezos-016-PtMumbai-test-helpers.opam b/opam/tezos-016-PtMumbai-test-helpers.opam index 9a724812909a..f573704874ca 100644 --- a/opam/tezos-016-PtMumbai-test-helpers.opam +++ b/opam/tezos-016-PtMumbai-test-helpers.opam @@ -12,16 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" - "tezos-base" - "tezos-micheline" - "tezos-stdlib-unix" + "octez-libs" "tezos-protocol-016-PtMumbai" "tezos-client-016-PtMumbai" "tezos-protocol-environment" "tezos-protocol-plugin-016-PtMumbai" - "tezos-shell-services" "octez-plompiler" - "tezos-crypto-dal" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam index fd6da81869bd..493b25f5d2ff 100644 --- a/opam/tezos-017-PtNairob-test-helpers.opam +++ b/opam/tezos-017-PtNairob-test-helpers.opam @@ -12,16 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" - "tezos-base" - "tezos-micheline" - "tezos-stdlib-unix" + "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" "tezos-protocol-environment" "tezos-protocol-plugin-017-PtNairob" - "tezos-shell-services" "octez-plompiler" - "tezos-crypto-dal" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-018-Proxford-test-helpers.opam b/opam/tezos-018-Proxford-test-helpers.opam index b0d81be2487c..c42d6a640783 100644 --- a/opam/tezos-018-Proxford-test-helpers.opam +++ b/opam/tezos-018-Proxford-test-helpers.opam @@ -12,16 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" - "tezos-base" - "tezos-micheline" - "tezos-stdlib-unix" + "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" "tezos-protocol-environment" "tezos-protocol-plugin-018-Proxford" - "tezos-shell-services" "octez-plompiler" - "tezos-crypto-dal" "tezos-smart-rollup-018-Proxford" ] build: [ diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 194c59e1d042..8e7f01e55b4b 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -12,16 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } "tezos-test-helpers" - "tezos-base" - "tezos-micheline" - "tezos-stdlib-unix" + "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-protocol-environment" "tezos-protocol-plugin-alpha" - "tezos-shell-services" "octez-plompiler" - "tezos-crypto-dal" "tezos-smart-rollup-alpha" ] build: [ diff --git a/opam/tezos-baking-016-PtMumbai-commands.opam b/opam/tezos-baking-016-PtMumbai-commands.opam index 8e03e528937d..6a7a5ecee84c 100644 --- a/opam/tezos-baking-016-PtMumbai-commands.opam +++ b/opam/tezos-baking-016-PtMumbai-commands.opam @@ -10,16 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" - "tezos-stdlib-unix" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-016-PtMumbai" "tezos-client-commands" "tezos-baking-016-PtMumbai" - "tezos-rpc" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-baking-016-PtMumbai.opam b/opam/tezos-baking-016-PtMumbai.opam index cd07324b0c6a..ed8d81e00621 100644 --- a/opam/tezos-baking-016-PtMumbai.opam +++ b/opam/tezos-baking-016-PtMumbai.opam @@ -10,24 +10,17 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-version" "tezos-protocol-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-016-PtMumbai" "tezos-client-commands" - "tezos-stdlib" - "tezos-stdlib-unix" "tezos-shell-context" - "tezos-context" - "tezos-rpc-http-client-unix" "tezos-context-ops" - "tezos-rpc" - "tezos-rpc-http" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } @@ -37,9 +30,6 @@ depends: [ "tezos-mockup-proxy" "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} - "tezos-crypto" {with-test} "octez-alcotezt" {with-test} ] build: [ diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam index cacf526cd96f..ffb73c316330 100644 --- a/opam/tezos-baking-017-PtNairob-commands.opam +++ b/opam/tezos-baking-017-PtNairob-commands.opam @@ -10,16 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-stdlib-unix" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-017-PtNairob" "tezos-client-commands" "tezos-baking-017-PtNairob" - "tezos-rpc" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index 4e4020ccdf66..944abd7acd45 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -10,24 +10,17 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-version" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-017-PtNairob" "tezos-client-commands" - "tezos-stdlib" - "tezos-stdlib-unix" "tezos-shell-context" - "tezos-context" - "tezos-rpc-http-client-unix" "tezos-context-ops" - "tezos-rpc" - "tezos-rpc-http" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" @@ -38,9 +31,6 @@ depends: [ "tezos-mockup-proxy" "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} - "tezos-crypto" {with-test} "octez-alcotezt" {with-test} ] build: [ diff --git a/opam/tezos-baking-018-Proxford-commands.opam b/opam/tezos-baking-018-Proxford-commands.opam index ce796b3e62b5..60956cdc1488 100644 --- a/opam/tezos-baking-018-Proxford-commands.opam +++ b/opam/tezos-baking-018-Proxford-commands.opam @@ -10,16 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-018-Proxford" - "tezos-stdlib-unix" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-018-Proxford" "tezos-client-commands" "tezos-baking-018-Proxford" - "tezos-rpc" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-baking-018-Proxford.opam b/opam/tezos-baking-018-Proxford.opam index edad1f311fd4..5643cf0e1a17 100644 --- a/opam/tezos-baking-018-Proxford.opam +++ b/opam/tezos-baking-018-Proxford.opam @@ -10,24 +10,17 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-version" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-018-Proxford" "tezos-client-commands" - "tezos-stdlib" - "tezos-stdlib-unix" "tezos-shell-context" - "tezos-context" - "tezos-rpc-http-client-unix" "tezos-context-ops" - "tezos-rpc" - "tezos-rpc-http" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" @@ -38,9 +31,6 @@ depends: [ "tezos-mockup-proxy" "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} - "tezos-crypto" {with-test} "octez-alcotezt" {with-test} ] build: [ diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index 1bb7599222b6..723860825a1c 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -10,16 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-alpha" - "tezos-stdlib-unix" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-alpha" "tezos-client-commands" "tezos-baking-alpha" - "tezos-rpc" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 68591d6e8e5c..0d3cf3a1e3a5 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -10,24 +10,17 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" "tezos-protocol-environment" - "tezos-shell-services" "tezos-client-base" "tezos-client-alpha" "tezos-client-commands" - "tezos-stdlib" - "tezos-stdlib-unix" "tezos-shell-context" - "tezos-context" - "tezos-rpc-http-client-unix" "tezos-context-ops" - "tezos-rpc" - "tezos-rpc-http" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" @@ -38,9 +31,6 @@ depends: [ "tezos-mockup-proxy" "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} - "tezos-crypto" {with-test} "octez-alcotezt" {with-test} ] build: [ diff --git a/opam/tezos-base-test-helpers.opam b/opam/tezos-base-test-helpers.opam deleted file mode 100644 index 2a66e00836f8..000000000000 --- a/opam/tezos-base-test-helpers.opam +++ /dev/null @@ -1,25 +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" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-event-logging-test-helpers" - "tezos-test-helpers" - "octez-alcotezt" - "qcheck-alcotest" { >= "0.20" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: Tezos base test helpers" diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam deleted file mode 100644 index 914787bfa996..000000000000 --- a/opam/tezos-base.opam +++ /dev/null @@ -1,38 +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" } - "tezos-stdlib" - "tezos-crypto" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-error-monad" - "tezos-rpc" - "tezos-micheline" - "tezos-event-logging" - "ptime" { >= "1.1.0" } - "ezjsonm" { >= "1.1.0" } - "lwt" { >= "5.6.0" } - "ipaddr" { >= "5.0.0" & < "6.0.0" } - "uri" { >= "3.1.0" } - "ppx_expect" - "tezos-hacl" - "tezos-stdlib-unix" - "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {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: "Tezos: meta-package and pervasive type definitions for Tezos" diff --git a/opam/tezos-benchmark-016-PtMumbai.opam b/opam/tezos-benchmark-016-PtMumbai.opam index e28836e899df..e9b161210d5a 100644 --- a/opam/tezos-benchmark-016-PtMumbai.opam +++ b/opam/tezos-benchmark-016-PtMumbai.opam @@ -10,15 +10,11 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-benchmark" "tezos-benchmark-type-inference-016-PtMumbai" "tezos-protocol-016-PtMumbai" - "tezos-crypto" "hashcons" "tezos-016-PtMumbai-test-helpers" "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/tezos-benchmark-017-PtNairob.opam b/opam/tezos-benchmark-017-PtNairob.opam index 15134b1178f4..9b6c6d07e409 100644 --- a/opam/tezos-benchmark-017-PtNairob.opam +++ b/opam/tezos-benchmark-017-PtNairob.opam @@ -10,15 +10,11 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-benchmark" "tezos-benchmark-type-inference-017-PtNairob" "tezos-protocol-017-PtNairob" - "tezos-crypto" "hashcons" "tezos-017-PtNairob-test-helpers" "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/tezos-benchmark-018-Proxford.opam b/opam/tezos-benchmark-018-Proxford.opam index 17d8c3a36dcb..d055b0af0084 100644 --- a/opam/tezos-benchmark-018-Proxford.opam +++ b/opam/tezos-benchmark-018-Proxford.opam @@ -10,15 +10,11 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-benchmark" "tezos-benchmark-type-inference-018-Proxford" "tezos-protocol-018-Proxford" - "tezos-crypto" "hashcons" "tezos-018-Proxford-test-helpers" "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index 74be164c9d36..e8036dac73d7 100644 --- a/opam/tezos-benchmark-alpha.opam +++ b/opam/tezos-benchmark-alpha.opam @@ -10,15 +10,11 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-benchmark" "tezos-benchmark-type-inference-alpha" "tezos-protocol-alpha" - "tezos-crypto" "hashcons" "tezos-alpha-test-helpers" "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/tezos-benchmark-examples.opam b/opam/tezos-benchmark-examples.opam index b177b136d2f7..a9ef123c886c 100644 --- a/opam/tezos-benchmark-examples.opam +++ b/opam/tezos-benchmark-examples.opam @@ -10,9 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-crypto" + "octez-libs" "tezos-benchmark" ] build: [ diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index ad2516fd9f85..33ef78f5c82c 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -12,10 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} - "tezos-base" {with-test} - "tezos-stdlib-unix" {with-test} - "tezos-micheline" {with-test} - "tezos-crypto" {with-test} + "octez-libs" {with-test} "tezos-benchmark" {with-test} "tezos-benchmark-examples" {with-test} ] diff --git a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam index 1f3d1f2a5e66..bf020049f647 100644 --- a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam +++ b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam @@ -10,10 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-error-monad" - "tezos-crypto" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-protocol-016-PtMumbai" "hashcons" diff --git a/opam/tezos-benchmark-type-inference-017-PtNairob.opam b/opam/tezos-benchmark-type-inference-017-PtNairob.opam index de0e2af54457..c84e13071473 100644 --- a/opam/tezos-benchmark-type-inference-017-PtNairob.opam +++ b/opam/tezos-benchmark-type-inference-017-PtNairob.opam @@ -10,10 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-error-monad" - "tezos-crypto" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-protocol-017-PtNairob" "hashcons" diff --git a/opam/tezos-benchmark-type-inference-018-Proxford.opam b/opam/tezos-benchmark-type-inference-018-Proxford.opam index bc0eb079fef5..52328d8c099c 100644 --- a/opam/tezos-benchmark-type-inference-018-Proxford.opam +++ b/opam/tezos-benchmark-type-inference-018-Proxford.opam @@ -10,10 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-error-monad" - "tezos-crypto" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-protocol-018-Proxford" "hashcons" diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam index 91f3a7ce416d..cba77bf94c28 100644 --- a/opam/tezos-benchmark-type-inference-alpha.opam +++ b/opam/tezos-benchmark-type-inference-alpha.opam @@ -10,10 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-error-monad" - "tezos-crypto" - "tezos-micheline" + "octez-libs" "tezos-micheline-rewriting" "tezos-protocol-alpha" "hashcons" diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index 2c502beae15a..5d24d8fd39d9 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -11,10 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" - "tezos-stdlib-unix" - "tezos-crypto" - "tezos-micheline" + "octez-libs" "tezos-clic" "data-encoding" { >= "0.7.1" & < "1.0.0" } "prbnmcn-linalg" { = "0.0.1" } diff --git a/opam/tezos-benchmarks-proto-016-PtMumbai.opam b/opam/tezos-benchmarks-proto-016-PtMumbai.opam index 26236829dead..d2544f1c66b3 100644 --- a/opam/tezos-benchmarks-proto-016-PtMumbai.opam +++ b/opam/tezos-benchmarks-proto-016-PtMumbai.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" + "octez-libs" "tezos-protocol-016-PtMumbai" - "tezos-lazy-containers" "tezos-benchmark" "tezos-benchmark-016-PtMumbai" "tezos-benchmark-type-inference-016-PtMumbai" - "tezos-crypto" "tezos-shell-benchmarks" - "tezos-micheline" "tezos-016-PtMumbai-test-helpers" "tezos-sapling" "tezos-client-016-PtMumbai" diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam index 8ec2f1aa23fa..51a70b39aac2 100644 --- a/opam/tezos-benchmarks-proto-017-PtNairob.opam +++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" + "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-lazy-containers" "tezos-benchmark" "tezos-benchmark-017-PtNairob" "tezos-benchmark-type-inference-017-PtNairob" - "tezos-crypto" "tezos-shell-benchmarks" - "tezos-micheline" "tezos-017-PtNairob-test-helpers" "tezos-sapling" "tezos-client-017-PtNairob" diff --git a/opam/tezos-benchmarks-proto-018-Proxford.opam b/opam/tezos-benchmarks-proto-018-Proxford.opam index 8bab5d7f3131..761dcc2648c8 100644 --- a/opam/tezos-benchmarks-proto-018-Proxford.opam +++ b/opam/tezos-benchmarks-proto-018-Proxford.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" + "octez-libs" "tezos-protocol-018-Proxford" - "tezos-lazy-containers" "tezos-benchmark" "tezos-benchmark-018-Proxford" "tezos-benchmark-type-inference-018-Proxford" - "tezos-crypto" "tezos-shell-benchmarks" - "tezos-micheline" "tezos-018-Proxford-test-helpers" "tezos-sapling" "tezos-client-018-Proxford" diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index a91e1bd6ba4c..475729d4ddb0 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" + "octez-libs" "tezos-protocol-alpha" - "tezos-lazy-containers" "tezos-benchmark" "tezos-benchmark-alpha" "tezos-benchmark-type-inference-alpha" - "tezos-crypto" "tezos-shell-benchmarks" - "tezos-micheline" "tezos-alpha-test-helpers" "tezos-sapling" "tezos-client-alpha" diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index 40ce0a1b624d..714fa6148f29 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -10,12 +10,10 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" + "octez-libs" "lwt" { >= "5.6.0" } "re" { >= "1.9.0" } - "tezos-error-monad" "tezos-lwt-result-stdlib" - "tezos-stdlib-unix" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index b49716b90853..8ee3de7abffa 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -10,14 +10,11 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-000-Ps9mPmXa" - "tezos-rpc" "tezos-client-commands" - "tezos-stdlib-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index a9850c3fd712..aaa91cadfcd1 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-001-PtCJ7pwo" "tezos-signer-backends" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index e710cd55badd..e26ec4903004 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-002-PsYLVpVv" "tezos-signer-backends" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 84112f033898..3fac546eb231 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-003-PsddFKi3" "tezos-signer-backends" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 796cc57a3b72..922f7dbe81de 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-004-Pt24m4xi" "tezos-signer-backends" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 337817d8863c..fba4ce62824c 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-005-PsBabyM1" "tezos-signer-backends" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index 85db87d45964..f5002f4655ab 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-006-PsCARTHA" "tezos-signer-backends" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index 788f09fc84ae..14d48487e5bb 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -10,16 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-007-PsDELPH1" "tezos-signer-backends" "tezos-protocol-plugin-007-PsDELPH1" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 2e2d48cc6eac..0b475eb22efb 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -10,16 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-008-PtEdo2Zk" "tezos-signer-backends" "tezos-protocol-plugin-008-PtEdo2Zk" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" ] diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 76cdebf5c8a4..d9dd51ffb676 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -11,16 +11,13 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-009-PsFLoren" "tezos-signer-backends" "tezos-protocol-plugin-009-PsFLoren" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" "tezos-client-base-unix" diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index e74186a73c26..13bf0f978c73 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -11,16 +11,13 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-010-PtGRANAD" "tezos-signer-backends" "tezos-protocol-plugin-010-PtGRANAD" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-client-commands" "tezos-client-base-unix" diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index ee95682a9f95..af40322c3235 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -11,24 +11,20 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-011-PtHangz2" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-011-PtHangz2" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 0464337cc054..6d1fae62afa9 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -11,24 +11,20 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-012-Psithaca" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-012-Psithaca" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index 9b0527ff28c5..d462dd23343d 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -11,24 +11,20 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-013-PtJakart" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-013-PtJakart" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 43293c36d385..b59cc71c8009 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -11,24 +11,20 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-014-PtKathma" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-014-PtKathma" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index c764c13a5ff7..037013d2e551 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -11,24 +11,20 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-015-PtLimaPt" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-015-PtLimaPt" - "tezos-rpc" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index 5f283d163bb7..0107c6f47c61 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -11,28 +11,22 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-016-PtMumbai" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-016-PtMumbai" - "tezos-rpc" "tezos-smart-rollup-016-PtMumbai" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index 99253001b63f..b400051b5675 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -11,28 +11,22 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-017-PtNairob" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-017-PtNairob" - "tezos-rpc" "tezos-smart-rollup-017-PtNairob" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "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 8a4f4b0b4625..6315f8bf8209 100644 --- a/opam/tezos-client-018-Proxford.opam +++ b/opam/tezos-client-018-Proxford.opam @@ -11,28 +11,22 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-018-Proxford" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-018-Proxford" - "tezos-rpc" "tezos-smart-rollup-018-Proxford" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "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 21a892db1faa..773a3a189072 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -11,28 +11,22 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-shell-services" "tezos-client-base" "tezos-protocol-alpha" "tezos-mockup-registration" "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-alpha" - "tezos-rpc" "tezos-smart-rollup-alpha" "uri" { >= "3.1.0" } - "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" - "tezos-crypto" "tezt" { with-test & >= "3.1.1" } - "tezos-micheline" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "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 index ab8d961e94f0..44e1309e5396 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -10,13 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-rpc" - "tezos-rpc-http" - "tezos-rpc-http-client-unix" - "tezos-shell-services" - "tezos-stdlib-unix" "tezos-client-base" "tezos-client-commands" "tezos-mockup" @@ -28,7 +23,6 @@ depends: [ "lwt-exit" "uri" { >= "3.1.0" } "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "octez-alcotezt" {with-test} ] build: [ diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index 32612041bd39..75e055188168 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -10,10 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" - "tezos-rpc" - "tezos-shell-services" "tezos-sapling" "uri" { >= "3.1.0" } "tezt" { with-test & >= "3.1.1" } diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam index 32c141360222..616e1a72642f 100644 --- a/opam/tezos-client-commands.opam +++ b/opam/tezos-client-commands.opam @@ -10,13 +10,9 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-rpc" + "octez-libs" "tezos-clic" "tezos-client-base" - "tezos-shell-services" - "tezos-p2p-services" - "tezos-stdlib-unix" "tezos-signer-backends" "data-encoding" { >= "0.7.1" & < "1.0.0" } "uri" { >= "3.1.0" } diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam index 9d2a6c09b154..c2733981d91e 100644 --- a/opam/tezos-client-demo-counter.opam +++ b/opam/tezos-client-demo-counter.opam @@ -10,8 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-shell-services" + "octez-libs" "tezos-client-base" "tezos-client-commands" "tezos-protocol-demo-counter" diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index edbc26fc82ac..25bbf567c840 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -10,14 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-shell-services" + "octez-libs" "tezos-client-base" "tezos-protocol-environment" "tezos-protocol-genesis" "tezos-client-commands" "tezos-proxy" - "tezos-stdlib-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam index 48f73d92f16f..247970898b2d 100644 --- a/opam/tezos-context-ops.opam +++ b/opam/tezos-context-ops.opam @@ -10,10 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-error-monad" + "octez-libs" "tezos-protocol-environment" - "tezos-context" "tezos-shell-context" ] build: [ diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam deleted file mode 100644 index 65302d805546..000000000000 --- a/opam/tezos-context.opam +++ /dev/null @@ -1,34 +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" } - "tezos-base" - "tezos-stdlib" - "irmin" { >= "3.7.2" & < "3.8.0" } - "irmin-pack" { >= "3.7.2" & < "3.8.0" } - "tezos-stdlib-unix" - "fmt" { >= "0.8.7" } - "bigstringaf" { >= "0.5.0" } - "logs" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } -] -conflicts: [ - "checkseum" { = "0.5.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: on-disk context abstraction for `octez-node`" diff --git a/opam/tezos-crypto-dal.opam b/opam/tezos-crypto-dal.opam deleted file mode 100644 index 78722761c6e5..000000000000 --- a/opam/tezos-crypto-dal.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" } - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-stdlib" - "tezos-error-monad" - "tezos-crypto" - "octez-bls12-381-polynomial" - "lwt" { >= "5.6.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "DAL cryptographic primitives" diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam deleted file mode 100644 index 9dd52852db48..000000000000 --- a/opam/tezos-crypto.opam +++ /dev/null @@ -1,36 +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" } - "tezos-stdlib" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-lwt-result-stdlib" - "lwt" { >= "5.6.0" } - "tezos-hacl" - "secp256k1-internal" { >= "0.4.0" } - "tezos-error-monad" - "tezos-rpc" - "aches" { >= "1.0.0" } - "zarith" { >= "1.12" & < "1.13" } - "zarith_stubs_js" - "bls12-381" - "octez-bls12-381-signature" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library with all the cryptographic primitives used by Tezos" diff --git a/opam/tezos-dac-017-PtNairob.opam b/opam/tezos-dac-017-PtNairob.opam index 30ab04c96a19..381409b54a7e 100644 --- a/opam/tezos-dac-017-PtNairob.opam +++ b/opam/tezos-dac-017-PtNairob.opam @@ -11,16 +11,14 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dac-lib" "tezos-dac-client-lib" "tezos-client-017-PtNairob" "tezos-embedded-protocol-017-PtNairob" "tezos-protocol-017-PtNairob" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-017-PtNairob-test-helpers" {with-test} "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} diff --git a/opam/tezos-dac-018-Proxford.opam b/opam/tezos-dac-018-Proxford.opam index 1f84203c3f61..ac1dcb89c77e 100644 --- a/opam/tezos-dac-018-Proxford.opam +++ b/opam/tezos-dac-018-Proxford.opam @@ -11,16 +11,14 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dac-lib" "tezos-dac-client-lib" "tezos-client-018-Proxford" "tezos-embedded-protocol-018-Proxford" "tezos-protocol-018-Proxford" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-018-Proxford-test-helpers" {with-test} "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam index e8b59355f258..0484150bc5f2 100644 --- a/opam/tezos-dac-alpha.opam +++ b/opam/tezos-dac-alpha.opam @@ -11,16 +11,14 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dac-lib" "tezos-dac-client-lib" "tezos-client-alpha" "tezos-embedded-protocol-alpha" "tezos-protocol-alpha" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-alpha-test-helpers" {with-test} "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} diff --git a/opam/tezos-dac-client-lib.opam b/opam/tezos-dac-client-lib.opam index ba81d9937b6a..19bfae7b176e 100644 --- a/opam/tezos-dac-client-lib.opam +++ b/opam/tezos-dac-client-lib.opam @@ -10,10 +10,9 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" - "tezos-stdlib-unix" "tezos-dac-lib" ] build: [ diff --git a/opam/tezos-dac-lib-test.opam b/opam/tezos-dac-lib-test.opam index 03ae880e859b..05ba0f647099 100644 --- a/opam/tezos-dac-lib-test.opam +++ b/opam/tezos-dac-lib-test.opam @@ -11,11 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-stdlib" {with-test} - "tezos-stdlib-unix" {with-test} - "tezos-base" {with-test} + "octez-libs" {with-test} "tezos-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-dac-lib" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dac-lib.opam b/opam/tezos-dac-lib.opam index 4d8f96964a15..9bf97a3ea184 100644 --- a/opam/tezos-dac-lib.opam +++ b/opam/tezos-dac-lib.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-updater" ] build: [ diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam index a76523f1cbdb..3fef810d36a6 100644 --- a/opam/tezos-dac-node-lib-test.opam +++ b/opam/tezos-dac-node-lib-test.opam @@ -11,11 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-stdlib" {with-test} - "tezos-stdlib-unix" {with-test} - "tezos-base" {with-test} + "octez-libs" {with-test} "tezos-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index e592ff93f04f..741c92f5aa99 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -10,12 +10,10 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-client-base" "tezos-client-base-unix" - "tezos-stdlib-unix" "tezos-layer2-store" - "tezos-rpc-http-server" "tezos-dac-lib" "tezos-dac-client-lib" ] diff --git a/opam/tezos-dal-016-PtMumbai.opam b/opam/tezos-dal-016-PtMumbai.opam index fe19f463b708..4c5fa8944365 100644 --- a/opam/tezos-dal-016-PtMumbai.opam +++ b/opam/tezos-dal-016-PtMumbai.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dal-node-lib" "tezos-client-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" @@ -21,7 +20,6 @@ depends: [ "tezos-layer2-utils-016-PtMumbai" "tezos-protocol-016-PtMumbai" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-016-PtMumbai-test-helpers" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dal-017-PtNairob.opam b/opam/tezos-dal-017-PtNairob.opam index f85b1d5c3d74..bbde245b9641 100644 --- a/opam/tezos-dal-017-PtNairob.opam +++ b/opam/tezos-dal-017-PtNairob.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dal-node-lib" "tezos-client-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" @@ -21,7 +20,6 @@ depends: [ "tezos-layer2-utils-017-PtNairob" "tezos-protocol-017-PtNairob" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-017-PtNairob-test-helpers" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dal-018-Proxford.opam b/opam/tezos-dal-018-Proxford.opam index 9d21a38439c3..2ce0b3c7601d 100644 --- a/opam/tezos-dal-018-Proxford.opam +++ b/opam/tezos-dal-018-Proxford.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dal-node-lib" "tezos-client-018-Proxford" "tezos-protocol-plugin-018-Proxford" @@ -21,7 +20,6 @@ depends: [ "tezos-layer2-utils-018-Proxford" "tezos-protocol-018-Proxford" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-018-Proxford-test-helpers" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dal-alpha.opam b/opam/tezos-dal-alpha.opam index e2bffefdb3b5..d4aa76138fd1 100644 --- a/opam/tezos-dal-alpha.opam +++ b/opam/tezos-dal-alpha.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "octez-protocol-compiler" - "tezos-stdlib-unix" "tezos-dal-node-lib" "tezos-client-alpha" "tezos-protocol-plugin-alpha" @@ -21,7 +20,6 @@ depends: [ "tezos-layer2-utils-alpha" "tezos-protocol-alpha" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-alpha-test-helpers" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index 9217fffacca0..5e7b3c999842 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -10,17 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-dal-node-services" "tezos-client-base" "tezos-protocol-updater" "tezos-client-base-unix" - "tezos-stdlib-unix" - "tezos-crypto-dal" - "tezos-p2p" - "tezos-p2p-services" "tezos-gossipsub" - "tezos-crypto" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-dal-node-services.opam b/opam/tezos-dal-node-services.opam index b65889ca1af8..19e435684258 100644 --- a/opam/tezos-dal-node-services.opam +++ b/opam/tezos-dal-node-services.opam @@ -10,9 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-rpc" - "tezos-crypto-dal" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam deleted file mode 100644 index 02c3513745b3..000000000000 --- a/opam/tezos-error-monad.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" } - "tezos-stdlib" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "lwt-canceler" { >= "0.3" & < "0.4" } - "lwt" { >= "5.6.0" } - "tezos-lwt-result-stdlib" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -conflicts: [ - "result" { < "1.5" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: error monad" diff --git a/opam/tezos-event-logging-test-helpers.opam b/opam/tezos-event-logging-test-helpers.opam deleted file mode 100644 index 9f01ecdd7fcc..000000000000 --- a/opam/tezos-event-logging-test-helpers.opam +++ /dev/null @@ -1,26 +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" } - "tezos-stdlib" - "tezos-lwt-result-stdlib" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-error-monad" - "tezos-event-logging" - "tezos-test-helpers" - "octez-alcotezt" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: test helpers for the event logging library" diff --git a/opam/tezos-event-logging.opam b/opam/tezos-event-logging.opam deleted file mode 100644 index 8d06c6a2765d..000000000000 --- a/opam/tezos-event-logging.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" } - "tezos-stdlib" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-error-monad" - "tezos-lwt-result-stdlib" - "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 event logging library" diff --git a/opam/tezos-gossipsub-test.opam b/opam/tezos-gossipsub-test.opam index 52009952a649..91f976a50f5a 100644 --- a/opam/tezos-gossipsub-test.opam +++ b/opam/tezos-gossipsub-test.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "fmt" { with-test & >= "0.8.7" } - "tezos-base" {with-test} + "octez-libs" {with-test} "tezos-gossipsub" {with-test} "tezt" { with-test & >= "3.1.1" } "qcheck-core" {with-test} diff --git a/opam/tezos-gossipsub.opam b/opam/tezos-gossipsub.opam index 4c6e03da474f..de3a67735529 100644 --- a/opam/tezos-gossipsub.opam +++ b/opam/tezos-gossipsub.opam @@ -13,11 +13,7 @@ depends: [ "ringo" { >= "1.0.0" } "aches" { >= "1.0.0" } "fmt" { >= "0.8.7" } - "tezos-error-monad" - "tezos-base" - "tezos-stdlib-unix" - "tezos-stdlib" - "tezos-version" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-hacl.opam b/opam/tezos-hacl.opam deleted file mode 100644 index 1d3edbfeb98e..000000000000 --- a/opam/tezos-hacl.opam +++ /dev/null @@ -1,37 +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" } - "hacl-star" { >= "0.7.1" & < "0.8" } - "hacl-star-raw" - "ctypes_stubs_js" - "ctypes" { >= "0.18.0" } - "ezjsonm" { >= "1.1.0" } - "tezt" { with-test & >= "3.1.1" } - "tezos-stdlib" {with-test} - "tezos-error-monad" {with-test} - "tezos-lwt-result-stdlib" {with-test} - "zarith" { with-test & >= "1.12" & < "1.13" } - "zarith_stubs_js" {with-test} - "data-encoding" { with-test & >= "0.7.1" & < "1.0.0" } - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} -] -conflicts: [ - "hacl_x25519" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: thin layer around hacl-star" diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam index 8574c1b46dc2..419ee345eb6a 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -11,14 +11,11 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "index" { >= "1.6.0" & < "1.7.0" } - "tezos-base" + "octez-libs" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "aches-lwt" { >= "1.0.0" } - "tezos-stdlib-unix" - "tezos-context" "tezt" { with-test & >= "3.1.1" } - "tezos-error-monad" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-layer2-utils-016-PtMumbai.opam b/opam/tezos-layer2-utils-016-PtMumbai.opam index ad89d5a09e33..79d0374927b9 100644 --- a/opam/tezos-layer2-utils-016-PtMumbai.opam +++ b/opam/tezos-layer2-utils-016-PtMumbai.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" "tezos-client-016-PtMumbai" ] diff --git a/opam/tezos-layer2-utils-017-PtNairob.opam b/opam/tezos-layer2-utils-017-PtNairob.opam index 1aeba5ea800b..ea0aa9697e96 100644 --- a/opam/tezos-layer2-utils-017-PtNairob.opam +++ b/opam/tezos-layer2-utils-017-PtNairob.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" ] diff --git a/opam/tezos-layer2-utils-018-Proxford.opam b/opam/tezos-layer2-utils-018-Proxford.opam index 0a79d3cc1278..c62068d9e93f 100644 --- a/opam/tezos-layer2-utils-018-Proxford.opam +++ b/opam/tezos-layer2-utils-018-Proxford.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" ] diff --git a/opam/tezos-layer2-utils-alpha.opam b/opam/tezos-layer2-utils-alpha.opam index 94c965c1f597..8045e0687a88 100644 --- a/opam/tezos-layer2-utils-alpha.opam +++ b/opam/tezos-layer2-utils-alpha.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" ] diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam index 3368a339e4c2..1c2149cd5df6 100644 --- a/opam/tezos-lazy-containers-tests.opam +++ b/opam/tezos-lazy-containers-tests.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-lazy-containers" {with-test} + "octez-libs" {with-test} "qcheck-core" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "lwt" { with-test & >= "5.6.0" } diff --git a/opam/tezos-lazy-containers.opam b/opam/tezos-lazy-containers.opam deleted file mode 100644 index a1085c7c4763..000000000000 --- a/opam/tezos-lazy-containers.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" } - "zarith" { >= "1.12" & < "1.13" } - "tezos-tree-encoding" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "A collection of lazy containers whose contents is fetched from arbitrary backend on-demand" diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index 696bbe685fb7..659ad55a1253 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -12,10 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" - "tezos-stdlib" - "tezos-crypto" - "tezos-error-monad" - "tezos-micheline" + "octez-libs" "tezt" { with-test & >= "3.1.1" } "tezos-protocol-alpha" {with-test} "tezos-client-alpha" {with-test} diff --git a/opam/tezos-micheline.opam b/opam/tezos-micheline.opam deleted file mode 100644 index 4989139cbfd7..000000000000 --- a/opam/tezos-micheline.opam +++ /dev/null @@ -1,26 +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" - "uutf" - "zarith" { >= "1.12" & < "1.13" } - "zarith_stubs_js" - "tezos-stdlib" - "tezos-error-monad" - "data-encoding" { >= "0.7.1" & < "1.0.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: internal AST and parser for the Michelson language" diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index e66b354ec976..d43e1c8c38df 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-client-commands" "tezos-client-base" diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam index bb0465d7e821..c64c35025f4f 100644 --- a/opam/tezos-mockup-proxy.opam +++ b/opam/tezos-mockup-proxy.opam @@ -10,13 +10,10 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-client-base" "tezos-protocol-environment" - "tezos-rpc-http" "resto-cohttp-self-serving-client" { >= "1.2" } - "tezos-rpc-http-client" - "tezos-shell-services" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam index 344ef6a5de81..1c900903096a 100644 --- a/opam/tezos-mockup-registration.opam +++ b/opam/tezos-mockup-registration.opam @@ -10,9 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-client-base" - "tezos-shell-services" "tezos-protocol-environment" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam index c167015e1fae..23da00941e64 100644 --- a/opam/tezos-mockup.opam +++ b/opam/tezos-mockup.opam @@ -10,20 +10,13 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-client-base" "tezos-mockup-proxy" "resto-cohttp-self-serving-client" { >= "1.2" } - "tezos-rpc" - "tezos-p2p-services" - "tezos-p2p" "tezos-protocol-environment" - "tezos-stdlib-unix" - "tezos-rpc-http" - "tezos-rpc-http-client" "tezos-mockup-registration" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} diff --git a/opam/tezos-p2p-services.opam b/opam/tezos-p2p-services.opam deleted file mode 100644 index 920a4de49cbd..000000000000 --- a/opam/tezos-p2p-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" } - "tezos-base" - "tezos-rpc" -] -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-p2p`" diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam deleted file mode 100644 index fcc5e9423545..000000000000 --- a/opam/tezos-p2p.opam +++ /dev/null @@ -1,36 +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" } - "lwt-watcher" { = "0.2" } - "lwt-canceler" { >= "0.3" & < "0.4" } - "ringo" { >= "1.0.0" } - "aches" { >= "1.0.0" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-stdlib" - "tezos-p2p-services" - "tezos-version" - "prometheus" { >= "1.2" } - "tezt" { >= "3.1.1" } - "tezos-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} - "tezos-event-logging-test-helpers" {with-test} - "tezt-tezos" {with-test} - "octez-alcotezt" {with-test} - "astring" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library for a pool of P2P connections" diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index 0909cf66cf78..d62b4ce66c61 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -11,28 +11,21 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-context" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-base" {with-test} "tezos-client-016-PtMumbai" {with-test} "tezos-protocol-016-PtMumbai" {with-test} "tezos-016-PtMumbai-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-protocol-plugin-016-PtMumbai" {with-test} "tezos-benchmark" {with-test} - "tezos-micheline" {with-test} "tezos-benchmark-016-PtMumbai" {with-test} "tezos-benchmark-type-inference-016-PtMumbai" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-test-helpers" {with-test} "tezos-smart-rollup-016-PtMumbai" {with-test} - "tezos-crypto-dal" {with-test} - "tezt-tezos" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} - "tezos-stdlib-unix" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-stdlib" {with-test} "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index fe2ea9caf81a..4691814f30eb 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -11,28 +11,21 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-context" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-base" {with-test} "tezos-client-017-PtNairob" {with-test} "tezos-protocol-017-PtNairob" {with-test} "tezos-017-PtNairob-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-protocol-plugin-017-PtNairob" {with-test} "tezos-benchmark" {with-test} - "tezos-micheline" {with-test} "tezos-benchmark-017-PtNairob" {with-test} "tezos-benchmark-type-inference-017-PtNairob" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-test-helpers" {with-test} "tezos-smart-rollup-017-PtNairob" {with-test} - "tezos-crypto-dal" {with-test} - "tezt-tezos" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} - "tezos-stdlib-unix" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-stdlib" {with-test} "tezos-scoru-wasm" {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 dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-017-PtNairob.opam +++ b/opam/tezos-protocol-017-PtNairob.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 9ccebd844d6c..16d79726f6b8 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -11,28 +11,21 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-context" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-base" {with-test} "tezos-client-018-Proxford" {with-test} "tezos-protocol-018-Proxford" {with-test} "tezos-018-Proxford-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-protocol-plugin-018-Proxford" {with-test} "tezos-benchmark" {with-test} - "tezos-micheline" {with-test} "tezos-benchmark-018-Proxford" {with-test} "tezos-benchmark-type-inference-018-Proxford" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-test-helpers" {with-test} "tezos-smart-rollup-018-Proxford" {with-test} - "tezos-crypto-dal" {with-test} - "tezt-tezos" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} - "tezos-stdlib-unix" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-stdlib" {with-test} "tezos-scoru-wasm" {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 dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-018-Proxford.opam +++ b/opam/tezos-protocol-018-Proxford.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 553cc385b862..0e2db41dfeb4 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -11,28 +11,21 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-context" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-base" {with-test} "tezos-client-alpha" {with-test} "tezos-protocol-alpha" {with-test} "tezos-alpha-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-protocol-plugin-alpha" {with-test} "tezos-benchmark" {with-test} - "tezos-micheline" {with-test} "tezos-benchmark-alpha" {with-test} "tezos-benchmark-type-inference-alpha" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-test-helpers" {with-test} "tezos-smart-rollup-alpha" {with-test} - "tezos-crypto-dal" {with-test} - "tezt-tezos" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} - "tezos-stdlib-unix" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-stdlib" {with-test} "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index dad3f88b6298..b43d6ceb97e5 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-environment" - "tezos-base" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 4a6babae9b79..7ab209f8c466 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -10,8 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14.0" & < "4.15" } - "tezos-stdlib" - "tezos-crypto" + "octez-libs" "tezos-lwt-result-stdlib" "tezos-scoru-wasm" "data-encoding" { >= "0.7.1" & < "1.0.0" } @@ -19,15 +18,10 @@ depends: [ "octez-plonk" "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" - "tezos-crypto-dal" "class_group_vdf" { >= "0.0.4" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } - "tezos-base" "tezos-sapling" - "tezos-micheline" - "tezos-context" - "tezos-event-logging" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "tezos-test-helpers" {with-test} diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam index c13568420e0a..d374767e2c24 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-007-PsDELPH1" "tezos-protocol-plugin-007-PsDELPH1" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1.opam b/opam/tezos-protocol-plugin-007-PsDELPH1.opam index 3bcf7df73d16..a7566f7b6d49 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-007-PsDELPH1" ] build: [ diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam index 5a632988fd6e..4775a0140833 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-008-PtEdo2Zk" "tezos-protocol-plugin-008-PtEdo2Zk" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam index 4b9127994b07..c53875ae93d6 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-008-PtEdo2Zk" ] build: [ diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam index 222d150a7097..2b6a491bbf5f 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-009-PsFLoren" "tezos-protocol-plugin-009-PsFLoren" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-009-PsFLoren.opam b/opam/tezos-protocol-plugin-009-PsFLoren.opam index de4a53f5af02..a1f73f6a01eb 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-009-PsFLoren" ] build: [ diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam index 3bd57717abd1..001431abcade 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-010-PtGRANAD" "tezos-protocol-plugin-010-PtGRANAD" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD.opam b/opam/tezos-protocol-plugin-010-PtGRANAD.opam index e9f86acf78fc..0ed34abe179a 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-010-PtGRANAD" ] build: [ diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam index 1803807fbd1e..b888133b3ded 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-011-PtHangz2" "tezos-protocol-plugin-011-PtHangz2" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-011-PtHangz2.opam b/opam/tezos-protocol-plugin-011-PtHangz2.opam index 35f1320fede5..795d80df656c 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-011-PtHangz2" ] build: [ diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam index c3f53f1a98ad..72598121557e 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-012-Psithaca.opam b/opam/tezos-protocol-plugin-012-Psithaca.opam index a74200e5f9b0..63da8f48cef6 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-012-Psithaca" ] build: [ diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam index fd5024965472..50e0b5397de1 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-013-PtJakart.opam b/opam/tezos-protocol-plugin-013-PtJakart.opam index 88c8c936dd37..decd43ddba15 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-013-PtJakart" ] build: [ diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam index 97c2c5efa00a..0b931cdb21fc 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-014-PtKathma.opam b/opam/tezos-protocol-plugin-014-PtKathma.opam index 4edaa354d44f..9fad8874af2e 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-014-PtKathma" ] build: [ diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam index 3f10461dc085..1e7731c06541 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-015-PtLimaPt" "tezos-protocol-plugin-015-PtLimaPt" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt.opam b/opam/tezos-protocol-plugin-015-PtLimaPt.opam index df66087ca891..143e24831636 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-015-PtLimaPt" ] build: [ diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam index 4235e342e934..a90ee672435c 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam index 8b9ca228c901..44147eedfe25 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-stdlib-unix" {with-test} - "tezos-micheline" {with-test} "tezos-protocol-plugin-016-PtMumbai" {with-test} "tezos-protocol-016-PtMumbai" {with-test} "tezos-016-PtMumbai-test-helpers" {with-test} diff --git a/opam/tezos-protocol-plugin-016-PtMumbai.opam b/opam/tezos-protocol-plugin-016-PtMumbai.opam index 453f3b0c6636..73cb3bafc9ea 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" "tezos-smart-rollup-016-PtMumbai" ] diff --git a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam index a805cee484c0..fdc2d2dd02a2 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam index f21b1c19bf91..d45766ddfa83 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-stdlib-unix" {with-test} - "tezos-micheline" {with-test} "tezos-protocol-plugin-017-PtNairob" {with-test} "tezos-protocol-017-PtNairob" {with-test} "tezos-017-PtNairob-test-helpers" {with-test} diff --git a/opam/tezos-protocol-plugin-017-PtNairob.opam b/opam/tezos-protocol-plugin-017-PtNairob.opam index ffa7d9a05d94..80178807bdf1 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-017-PtNairob" "tezos-smart-rollup-017-PtNairob" ] diff --git a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam index 41be4c472860..fad1e2e08cb9 100644 --- a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam +++ b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-018-Proxford-tests.opam b/opam/tezos-protocol-plugin-018-Proxford-tests.opam index e1156899c634..24a66dae05eb 100644 --- a/opam/tezos-protocol-plugin-018-Proxford-tests.opam +++ b/opam/tezos-protocol-plugin-018-Proxford-tests.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-stdlib-unix" {with-test} - "tezos-micheline" {with-test} "tezos-protocol-plugin-018-Proxford" {with-test} "tezos-protocol-018-Proxford" {with-test} "tezos-018-Proxford-test-helpers" {with-test} diff --git a/opam/tezos-protocol-plugin-018-Proxford.opam b/opam/tezos-protocol-plugin-018-Proxford.opam index 47db8e31fecd..50a99cff942f 100644 --- a/opam/tezos-protocol-plugin-018-Proxford.opam +++ b/opam/tezos-protocol-plugin-018-Proxford.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-018-Proxford" "tezos-smart-rollup-018-Proxford" ] diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam index 5aa84a3535cc..96098845109b 100644 --- a/opam/tezos-protocol-plugin-alpha-registerer.opam +++ b/opam/tezos-protocol-plugin-alpha-registerer.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-embedded-protocol-alpha" "tezos-protocol-plugin-alpha" "tezos-validation" diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index e558fdce5908..4024a5edcc45 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "octez-alcotezt" {with-test} "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-stdlib-unix" {with-test} - "tezos-micheline" {with-test} "tezos-protocol-plugin-alpha" {with-test} "tezos-protocol-alpha" {with-test} "tezos-alpha-test-helpers" {with-test} diff --git a/opam/tezos-protocol-plugin-alpha.opam b/opam/tezos-protocol-plugin-alpha.opam index 8dc984f77845..aad417a33a27 100644 --- a/opam/tezos-protocol-plugin-alpha.opam +++ b/opam/tezos-protocol-plugin-alpha.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-alpha" "tezos-smart-rollup-alpha" ] diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam index af9e00ef0823..48cb2c501e1c 100644 --- a/opam/tezos-protocol-updater.opam +++ b/opam/tezos-protocol-updater.opam @@ -10,14 +10,10 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" - "tezos-micheline" - "tezos-shell-services" + "octez-libs" "tezos-protocol-environment" "tezos-shell-context" "octez-protocol-compiler" - "tezos-context" "lwt-exit" ] build: [ diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index 987c8d024784..594b7c127802 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -10,8 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "uri" { >= "3.1.0" } "tezt" { with-test & >= "3.1.1" } "tezos-test-helpers" {with-test} diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index 22819278bbb1..7efc2a2b9c2c 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -12,18 +12,13 @@ depends: [ "ocaml" { >= "4.14" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } - "tezos-base" + "octez-libs" "tezos-clic" "tezos-client-base" "tezos-protocol-environment" - "tezos-rpc" - "tezos-shell-services" - "tezos-context" "uri" { >= "3.1.0" } "tezos-mockup-proxy" "tezt" { with-test & >= "3.1.1" } - "tezos-stdlib-unix" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "qcheck-core" {with-test} "lwt" { with-test & >= "5.6.0" } diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam index 479a400a0798..295f33bd9148 100644 --- a/opam/tezos-requester.opam +++ b/opam/tezos-requester.opam @@ -10,13 +10,10 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib-unix" + "octez-libs" "lwt-watcher" { = "0.2" } "tezt" { with-test & >= "3.1.1" } "tezos-test-helpers" {with-test} - "tezos-base-test-helpers" {with-test} - "tezos-stdlib" {with-test} "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } ] diff --git a/opam/tezos-rpc-http-client-unix.opam b/opam/tezos-rpc-http-client-unix.opam deleted file mode 100644 index 73b4b2370dc1..000000000000 --- a/opam/tezos-rpc-http-client-unix.opam +++ /dev/null @@ -1,25 +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" } - "tezos-stdlib-unix" - "tezos-base" - "cohttp-lwt-unix" { >= "5.2.0" } - "resto-cohttp-client" { >= "1.2" } - "tezos-rpc" - "tezos-rpc-http-client" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: unix implementation of the RPC client" diff --git a/opam/tezos-rpc-http-client.opam b/opam/tezos-rpc-http-client.opam deleted file mode 100644 index 38fdaca9de29..000000000000 --- a/opam/tezos-rpc-http-client.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" } - "tezos-base" - "resto-cohttp-client" { >= "1.2" } - "tezos-rpc" - "tezos-rpc-http" -] -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 (http client)" diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam deleted file mode 100644 index e6d15971a413..000000000000 --- a/opam/tezos-rpc-http-server.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" } - "tezos-base" - "tezos-stdlib-unix" - "cohttp-lwt-unix" { >= "5.2.0" } - "resto-cohttp-server" { >= "1.2" } - "resto-acl" { >= "1.2" } - "tezos-rpc" - "tezos-rpc-http" - "tezt" { with-test & >= "3.1.1" } - "tezos-stdlib" {with-test} - "tezos-test-helpers" {with-test} - "tezos-base-test-helpers" {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: "Tezos: library of auto-documented RPCs (http server)" diff --git a/opam/tezos-rpc-http.opam b/opam/tezos-rpc-http.opam deleted file mode 100644 index ac049eb52d53..000000000000 --- a/opam/tezos-rpc-http.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" } - "tezos-base" - "tezos-rpc" - "resto-cohttp" { >= "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: library of auto-documented RPCs (http server and client)" diff --git a/opam/tezos-rpc.opam b/opam/tezos-rpc.opam deleted file mode 100644 index a509ebef2c93..000000000000 --- a/opam/tezos-rpc.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" } - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-error-monad" - "resto" { >= "1.2" } - "resto-directory" { >= "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: library of auto-documented RPCs (service and hierarchy descriptions)" diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index 648f1eb66f9d..fae7a094177a 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -16,17 +16,11 @@ depends: [ "ctypes" { >= "0.18.0" } "ctypes_stubs_js" "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-stdlib" - "tezos-crypto" - "tezos-error-monad" + "octez-libs" "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } "tezos-lwt-result-stdlib" - "tezos-hacl" {with-test} "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-stdlib-unix" {with-test} - "tezos-base-test-helpers" {with-test} "octez-alcotezt" {with-test} ] x-opam-monorepo-opam-provided: [ diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam index 0a8c33658b83..327236cd175a 100644 --- a/opam/tezos-sc-rollup-node-test.opam +++ b/opam/tezos-sc-rollup-node-test.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" "tezos-client-016-PtMumbai" "tezos-test-helpers" diff --git a/opam/tezos-scoru-wasm-durable-snapshot.opam b/opam/tezos-scoru-wasm-durable-snapshot.opam index 83c2fcca1c2f..28b3be58b1b7 100644 --- a/opam/tezos-scoru-wasm-durable-snapshot.opam +++ b/opam/tezos-scoru-wasm-durable-snapshot.opam @@ -12,8 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "ppx_import" "ppx_deriving" - "tezos-base" - "tezos-tree-encoding" + "octez-libs" "tezos-webassembly-interpreter-extra" ] build: [ diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/tezos-scoru-wasm-fast-test.opam index a63f6373c30e..6cd91105ebbb 100644 --- a/opam/tezos-scoru-wasm-fast-test.opam +++ b/opam/tezos-scoru-wasm-fast-test.opam @@ -13,10 +13,7 @@ depends: [ "ppx_import" {with-test} "ppx_deriving" {with-test} "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-tree-encoding" {with-test} - "tezos-context" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-scoru-wasm-test-helpers" {with-test} "tezos-test-helpers" {with-test} diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam index aa11d05296f6..501819d74b96 100644 --- a/opam/tezos-scoru-wasm-fast.opam +++ b/opam/tezos-scoru-wasm-fast.opam @@ -10,10 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-tree-encoding" + "octez-libs" "tezos-webassembly-interpreter" - "tezos-lazy-containers" "tezos-scoru-wasm" "tezos-wasmer" ] diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam index 2379f2f64bca..2ea61f167dc1 100644 --- a/opam/tezos-scoru-wasm-helpers.opam +++ b/opam/tezos-scoru-wasm-helpers.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "ppx_import" "ppx_deriving" - "tezos-base" - "tezos-tree-encoding" - "tezos-context" + "octez-libs" "tezos-scoru-wasm" "tezos-scoru-wasm-fast" "tezos-webassembly-interpreter-extra" diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index b65f35c3b285..4c2733390768 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "ppx_import" "ppx_deriving" - "tezos-base" + "octez-libs" "tezos-scoru-wasm" "tezos-scoru-wasm-helpers" "tezos-test-helpers" diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam index 8594717ba6dd..ca2c69adf81a 100644 --- a/opam/tezos-scoru-wasm-test-helpers.opam +++ b/opam/tezos-scoru-wasm-test-helpers.opam @@ -12,10 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "ppx_import" "ppx_deriving" - "tezos-base" - "tezos-tree-encoding" - "tezos-context" - "tezos-base-test-helpers" + "octez-libs" "tezos-test-helpers" "tezos-scoru-wasm" "tezos-scoru-wasm-durable-snapshot" diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam index ae4850d20fdb..6bab4b76fd83 100644 --- a/opam/tezos-scoru-wasm-test.opam +++ b/opam/tezos-scoru-wasm-test.opam @@ -13,10 +13,7 @@ depends: [ "ppx_import" {with-test} "ppx_deriving" {with-test} "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-tree-encoding" {with-test} - "tezos-context" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "tezos-test-helpers" {with-test} "tezos-scoru-wasm" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam index e21ef5d79822..7394a1522898 100644 --- a/opam/tezos-scoru-wasm.opam +++ b/opam/tezos-scoru-wasm.opam @@ -10,11 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-tree-encoding" - "tezos-lazy-containers" + "octez-libs" "tezos-webassembly-interpreter" - "tezos-context" "tezos-lwt-result-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } ] diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam index 3310334a4e7d..a783a1537cc9 100644 --- a/opam/tezos-shell-benchmarks.opam +++ b/opam/tezos-shell-benchmarks.opam @@ -10,14 +10,9 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib" - "tezos-base" - "tezos-error-monad" + "octez-libs" "tezos-benchmark" - "tezos-crypto" - "tezos-context" "tezos-shell-context" - "tezos-micheline" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam index 3069f0d7651e..161ae81990a3 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/tezos-shell-context-test.opam @@ -14,7 +14,7 @@ depends: [ "tezos-shell-context" {with-test} "octez-alcotezt" {with-test} "tezos-test-helpers" {with-test} - "tezos-base" {with-test} + "octez-libs" {with-test} "tezos-protocol-environment" {with-test} ] build: [ diff --git a/opam/tezos-shell-context.opam b/opam/tezos-shell-context.opam index 4e5d1eb76f17..8abc2e710ec6 100644 --- a/opam/tezos-shell-context.opam +++ b/opam/tezos-shell-context.opam @@ -10,9 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "tezos-protocol-environment" - "tezos-context" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam deleted file mode 100644 index 7d21f0fb3014..000000000000 --- a/opam/tezos-shell-services.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" } - "tezos-base" - "tezos-rpc" - "tezos-p2p-services" - "tezos-version" - "tezos-context" - "tezos-crypto-dal" - "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: descriptions of RPCs exported by `tezos-shell`" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index 02191b089483..af53a1cfd340 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -14,30 +14,20 @@ depends: [ "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } "prometheus" { >= "1.2" } - "tezos-base" - "tezos-rpc" - "tezos-context" + "octez-libs" "tezos-store" "tezos-protocol-environment" "tezos-context-ops" "tezos-shell-context" - "tezos-p2p" - "tezos-stdlib-unix" - "tezos-shell-services" - "tezos-p2p-services" "tezos-protocol-updater" "tezos-requester" - "tezos-workers" "tezos-validation" - "tezos-version" - "tezos-crypto-dal" "lwt-exit" "tezt" { with-test & >= "3.1.1" } - "tezos-base-test-helpers" {with-test} "tezos-embedded-protocol-demo-noops" {with-test} - "tezos-event-logging-test-helpers" {with-test} "tezos-test-helpers" {with-test} "octez-alcotezt" {with-test} + "tezos-version" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 13dd2de2101f..3b771aa739f0 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -10,22 +10,14 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-stdlib" + "octez-libs" "tezos-client-base" - "tezos-rpc-http" - "tezos-rpc-http-client" "tezos-signer-services" - "tezos-shell-services" "uri" { >= "3.1.0" } "ocplib-endian" "fmt" { >= "0.8.7" } "tezos-clic" - "tezos-stdlib-unix" - "tezos-rpc-http-client-unix" "tezt" { with-test & >= "3.1.1" } - "tezos-error-monad" {with-test} - "tezos-crypto" {with-test} "octez-alcotezt" {with-test} ] depopts: [ diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam index bd149321c4c4..96172384dc6a 100644 --- a/opam/tezos-signer-services.opam +++ b/opam/tezos-signer-services.opam @@ -10,8 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-rpc" + "octez-libs" "tezos-client-base" ] build: [ diff --git a/opam/tezos-smart-rollup-016-PtMumbai.opam b/opam/tezos-smart-rollup-016-PtMumbai.opam index 4fbfc652a0a3..5084c678b598 100644 --- a/opam/tezos-smart-rollup-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-016-PtMumbai.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" ] build: [ diff --git a/opam/tezos-smart-rollup-017-PtNairob.opam b/opam/tezos-smart-rollup-017-PtNairob.opam index 28b4ef502e33..f9a6963b45a4 100644 --- a/opam/tezos-smart-rollup-017-PtNairob.opam +++ b/opam/tezos-smart-rollup-017-PtNairob.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-017-PtNairob" ] build: [ diff --git a/opam/tezos-smart-rollup-018-Proxford.opam b/opam/tezos-smart-rollup-018-Proxford.opam index 34fd91355ff6..d01badfdf6bb 100644 --- a/opam/tezos-smart-rollup-018-Proxford.opam +++ b/opam/tezos-smart-rollup-018-Proxford.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-018-Proxford" ] build: [ diff --git a/opam/tezos-smart-rollup-alpha.opam b/opam/tezos-smart-rollup-alpha.opam index 325e9d291298..2ecf80d94faf 100644 --- a/opam/tezos-smart-rollup-alpha.opam +++ b/opam/tezos-smart-rollup-alpha.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-alpha" ] build: [ diff --git a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam index f0532ee5aa5f..f10680f08a6a 100644 --- a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-016-PtMumbai" "octez-injector" "octez-smart-rollup" diff --git a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam index 96ca020fb7e9..970980cff472 100644 --- a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam +++ b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-017-PtNairob" "octez-injector" "octez-smart-rollup" diff --git a/opam/tezos-smart-rollup-layer2-018-Proxford.opam b/opam/tezos-smart-rollup-layer2-018-Proxford.opam index 85635bb64603..4fcdee20560e 100644 --- a/opam/tezos-smart-rollup-layer2-018-Proxford.opam +++ b/opam/tezos-smart-rollup-layer2-018-Proxford.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-018-Proxford" "octez-injector" "octez-smart-rollup" diff --git a/opam/tezos-smart-rollup-layer2-alpha.opam b/opam/tezos-smart-rollup-layer2-alpha.opam index a37021988d47..45f54b6ad5ef 100644 --- a/opam/tezos-smart-rollup-layer2-alpha.opam +++ b/opam/tezos-smart-rollup-layer2-alpha.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_expect" - "tezos-base" + "octez-libs" "tezos-protocol-alpha" "octez-injector" "octez-smart-rollup" diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam deleted file mode 100644 index d13a5144de18..000000000000 --- a/opam/tezos-stdlib-unix.opam +++ /dev/null @@ -1,38 +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" } - "base-unix" - "tezos-error-monad" - "tezos-lwt-result-stdlib" - "tezos-event-logging" - "tezos-stdlib" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "aches-lwt" { >= "1.0.0" } - "lwt" { >= "5.6.0" } - "ipaddr" { >= "5.0.0" & < "6.0.0" } - "re" { >= "1.9.0" } - "ezjsonm" { >= "1.1.0" } - "ptime" { >= "1.1.0" } - "mtime" { >= "1.4.0" & < "2.0.0" } - "conf-libev" - "uri" { >= "3.1.0" } - "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {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: "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)" diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam deleted file mode 100644 index 3cf33bb7b44c..000000000000 --- a/opam/tezos-stdlib.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" } - "ppx_expect" - "hex" { >= "1.3.0" } - "zarith" { >= "1.12" & < "1.13" } - "zarith_stubs_js" - "lwt" { >= "5.6.0" } - "aches" { >= "1.0.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "bigstring" {with-test} - "tezos-test-helpers" {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: yet-another local-extension of the OCaml standard library" diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 25116ba6387d..daba4c894096 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -10,28 +10,21 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-stdlib-unix" - "tezos-base" - "tezos-crypto" - "tezos-shell-services" + "octez-libs" "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "tezos-validation" - "tezos-version" "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "tezos-protocol-environment" - "tezos-context" "tezos-context-ops" "tezos-shell-context" "tezos-protocol-updater" - "tezos-stdlib" "lwt-watcher" { = "0.2" } "camlzip" { >= "1.11" & < "1.12" } "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } "prometheus" { >= "1.2" } - "tezos-rpc" "tezt" { with-test & >= "3.1.1" } "tezos-embedded-protocol-demo-noops" {with-test} "tezos-embedded-protocol-genesis" {with-test} diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 9c6c09af4db7..721f5b3eb122 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" + "octez-libs" "caqti" "caqti-dynload" "caqti-lwt" @@ -21,7 +21,6 @@ depends: [ "tezos-client-base-unix" "tezos-protocol-alpha" "tezt" { >= "3.1.1" } - "tezt-tezos" "tezt-performance-regression" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 33a32105a3eb..85e98ab80314 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -11,10 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-base" {with-test} - "tezos-tree-encoding" {with-test} - "tezos-context" {with-test} - "tezos-base-test-helpers" {with-test} + "octez-libs" {with-test} "tezos-test-helpers" {with-test} "tezos-webassembly-interpreter" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-tree-encoding.opam b/opam/tezos-tree-encoding.opam deleted file mode 100644 index 1186a0a0f346..000000000000 --- a/opam/tezos-tree-encoding.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" } - "tezos-base" - "tezos-context" - "tezos-lwt-result-stdlib" - "data-encoding" { >= "0.7.1" & < "1.0.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "A general-purpose library to encode arbitrary data in Merkle trees" diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam index 49dc1e0e0356..fde39c6c4f8e 100644 --- a/opam/tezos-validation.opam +++ b/opam/tezos-validation.opam @@ -10,15 +10,10 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-base" - "tezos-crypto" - "tezos-rpc" - "tezos-context" + "octez-libs" "tezos-context-ops" "tezos-shell-context" - "tezos-shell-services" "tezos-protocol-updater" - "tezos-stdlib-unix" "tezos-version" ] build: [ diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam index 8b3af143d076..48d8277be3f9 100644 --- a/opam/tezos-version.opam +++ b/opam/tezos-version.opam @@ -10,15 +10,12 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "ppx_deriving" - "tezos-base" + "octez-libs" "dune-configurator" - "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: version information generated from Git" +synopsis: "Tezos: version value generated from Git" diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam index 9ae6c07d75db..6be8937ef1f6 100644 --- a/opam/tezos-webassembly-interpreter-extra.opam +++ b/opam/tezos-webassembly-interpreter-extra.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-webassembly-interpreter" "lwt" { >= "5.6.0" } - "tezos-lazy-containers" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 082cbb56177d..0dfd13f883b4 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -12,10 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "ppx_deriving" "tezos-lwt-result-stdlib" - "tezos-stdlib" - "tezos-error-monad" + "octez-libs" "zarith" { >= "1.12" & < "1.13" } - "tezos-lazy-containers" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam deleted file mode 100644 index 3a39b3b70166..000000000000 --- a/opam/tezos-workers.opam +++ /dev/null @@ -1,26 +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" } - "tezos-base" - "tezos-stdlib-unix" - "tezt" { with-test & >= "3.1.1" } - "tezos-stdlib" {with-test} - "tezos-test-helpers" {with-test} - "tezos-base-test-helpers" {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: "Tezos: worker library" diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam deleted file mode 100644 index 97610d2b8ead..000000000000 --- a/opam/tezt-tezos.opam +++ /dev/null @@ -1,26 +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" { >= "3.1.1" } - "tezt-performance-regression" - "uri" { >= "3.1.0" } - "hex" { >= "1.3.0" } - "tezos-crypto-dal" - "tezos-base" - "cohttp-lwt-unix" { >= "5.2.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos test framework based on Tezt" diff --git a/scripts/gen-genesis/dune b/scripts/gen-genesis/dune index 3a7721efaf7c..178d76445f75 100644 --- a/scripts/gen-genesis/dune +++ b/scripts/gen-genesis/dune @@ -2,6 +2,6 @@ (name gen_genesis) (libraries lwt.unix - tezos-base - tezos-base.unix - tezos-crypto)) + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-crypto)) diff --git a/src/bin_client/dune b/src/bin_client/dune index 5c65eb9a1d00..bfef9706e083 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -7,12 +7,12 @@ (package octez-client) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic - tezos-rpc-http-client - tezos-stdlib-unix - tezos-shell-services + 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 diff --git a/src/bin_codec/dune b/src/bin_codec/dune index f4fc2aecc219..f06eab708235 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -8,13 +8,13 @@ (instrumentation (backend bisect_ppx)) (libraries data-encoding - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-client-base-unix tezos-client-base tezos-clic - tezos-stdlib-unix - tezos-event-logging + octez-libs.tezos-stdlib-unix + octez-libs.tezos-event-logging tezos-signer-services tezos-version.value (select void_for_linking-tezos-client-005-PsBabyM1 from diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune index 5fb073925e5d..376d3debfb57 100644 --- a/src/bin_dac_client/dune +++ b/src/bin_dac_client/dune @@ -7,14 +7,14 @@ (package octez-dac-client) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands - tezos-stdlib-unix - tezos-stdlib + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib tezos-dac-lib tezos-dac-client-lib tezos-dac-017-PtNairob diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index 1fbfcf77f06c..9f7dadeb6120 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -7,18 +7,18 @@ (package octez-dac-node) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands - tezos-rpc-http - tezos-rpc-http-server + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server tezos-protocol-updater - tezos-rpc-http-client-unix - tezos-stdlib-unix - tezos-stdlib + octez-libs.tezos-rpc-http-client-unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib tezos-dac-lib tezos_dac_node_lib tezos_layer2_store diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index b6de70641138..efe18bc1e888 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -7,32 +7,32 @@ (package octez-dal-node) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-version + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-version cmdliner tezos-client-base tezos-client-base-unix tezos-client-commands - tezos-rpc-http - tezos-rpc-http-server + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server tezos-protocol-updater - tezos-rpc-http-client-unix - tezos-stdlib-unix - tezos-stdlib + octez-libs.tezos-rpc-http-client-unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib tezos-dal-node-lib tezos-dal-node-services tezos_layer2_store - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-store.unix tezos-store.shared tezos-gossipsub tezos-dal-node-lib.gossipsub - tezos-p2p - tezos-p2p-services - tezos-crypto - tezos-base.p2p-identity-file - tezos-shell-services + 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 irmin-pack irmin-pack.unix irmin diff --git a/src/bin_evm_proxy/chunker/dune b/src/bin_evm_proxy/chunker/dune index 7905401d8be2..8bea9ff1a6c8 100644 --- a/src/bin_evm_proxy/chunker/dune +++ b/src/bin_evm_proxy/chunker/dune @@ -5,7 +5,7 @@ (name octez_evm_chunker) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base evm_proxy_lib) (flags (:standard) diff --git a/src/bin_evm_proxy/dune b/src/bin_evm_proxy/dune index b30bb869c382..7656dafee944 100644 --- a/src/bin_evm_proxy/dune +++ b/src/bin_evm_proxy/dune @@ -7,11 +7,11 @@ (package octez-evm-proxy) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic - tezos-rpc-http - tezos-rpc-http-server + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server tezos-version.value evm_proxy_lib) (link_flags diff --git a/src/bin_evm_proxy/lib/dune b/src/bin_evm_proxy/lib/dune index 6ed2cfd2ff5c..1ca186f2568c 100644 --- a/src/bin_evm_proxy/lib/dune +++ b/src/bin_evm_proxy/lib/dune @@ -6,9 +6,9 @@ (package octez-evm-proxy-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc-http - tezos-rpc-http-client-unix + octez-libs.tezos-base + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-client-unix tezos-version.value lwt-exit rlp diff --git a/src/bin_evm_proxy/upgrade_signer/dune b/src/bin_evm_proxy/upgrade_signer/dune index a464f5b63a23..f49d8ac7cde6 100644 --- a/src/bin_evm_proxy/upgrade_signer/dune +++ b/src/bin_evm_proxy/upgrade_signer/dune @@ -5,8 +5,8 @@ (name octez_evm_upgrade_signer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic evm_proxy_lib) (flags diff --git a/src/bin_node/dune b/src/bin_node/dune index 5f0a2c93eaf5..f3e996fff4cf 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -7,24 +7,24 @@ (package octez-node) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-version + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-version tezos-version.value octez-node-config - tezos-stdlib-unix - tezos-shell-services - tezos-rpc-http - tezos-rpc-http-server - tezos-p2p + octez-libs.tezos-stdlib-unix + octez-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 - tezos-context + octez-libs.tezos-context tezos-validation tezos-shell-context - tezos-workers + octez-libs.tezos-workers tezos-protocol-updater cmdliner fmt.cli @@ -33,7 +33,7 @@ prometheus-app.unix lwt-exit uri - tezos-base.p2p-identity-file + octez-libs.tezos-base.p2p-identity-file (select void_for_linking-tezos-embedded-protocol-genesis from (tezos-embedded-protocol-genesis -> void_for_linking-tezos-embedded-protocol-genesis.empty) (-> void_for_linking-tezos-embedded-protocol-genesis.empty)) diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index dc71671cd28f..8740a19d2712 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -7,18 +7,18 @@ (package octez-proxy-server) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-rpc + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-rpc cmdliner lwt-exit lwt.unix tezos-proxy tezos-proxy-server-config - tezos-rpc-http-client-unix - tezos-rpc-http-server - tezos-shell-services + octez-libs.tezos-rpc-http-client-unix + octez-libs.tezos-rpc-http-server + octez-libs.tezos-shell-services tezos-shell-context tezos-version.value uri diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune index d9a05e903d3b..4d7ee4259c41 100644 --- a/src/bin_sequencer_node/dune +++ b/src/bin_sequencer_node/dune @@ -7,7 +7,7 @@ (package octez-smart-rollup-sequencer-node) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-client-base tezos-client-base-unix diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 74014166bbe7..6795e70e508e 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -7,18 +7,18 @@ (package octez-signer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands tezos-signer-services - tezos-rpc-http - tezos-rpc-http-server - tezos-rpc-http-client-unix - tezos-stdlib-unix - tezos-stdlib + 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) (link_flags (:standard) diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune index 332dfba77a55..9b222be7065b 100644 --- a/src/bin_smart_rollup_node/dune +++ b/src/bin_smart_rollup_node/dune @@ -7,9 +7,9 @@ (package octez-smart-rollup-node) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index b4d01774efd2..aa577005b859 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -7,9 +7,9 @@ (package octez-snoop) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix tezos-clic tezos-benchmark tezos-benchmark-examples diff --git a/src/bin_testnet_scenarios/dune b/src/bin_testnet_scenarios/dune index b06a169b7304..cf8a2f8f2743 100644 --- a/src/bin_testnet_scenarios/dune +++ b/src/bin_testnet_scenarios/dune @@ -7,7 +7,7 @@ (package octez-testnet-scenarios) (libraries tezt - tezt-tezos + octez-libs.tezt-tezos tezt_ethereum) (flags (:standard) diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index f5ea621ab352..de230c8c9d69 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -7,7 +7,7 @@ (package tezos-tps-evaluation) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base caqti caqti-dynload caqti-lwt @@ -18,7 +18,7 @@ tezos-client-base-unix tezos-protocol-alpha tezt - tezt-tezos + octez-libs.tezt-tezos tezt-performance-regression uri) (link_flags diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index b1e470c2628a..cbb890e7bdbb 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -7,10 +7,10 @@ (package octez-smart-rollup-wasm-debugger) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-tree-encoding - tezos-base.unix + octez-libs.tezos-tree-encoding + octez-libs.tezos-base.unix yaml tezos-client-alpha tezos-scoru-wasm diff --git a/src/lib_aplonk/plonk-aggregation/dune b/src/lib_aplonk/plonk-aggregation/dune index 76af7db5f4c8..730d89732f15 100644 --- a/src/lib_aplonk/plonk-aggregation/dune +++ b/src/lib_aplonk/plonk-aggregation/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-plonk - octez-bls12-381-polynomial) + octez-libs.octez-bls12-381-polynomial) (preprocess (pps ppx_repr)) (flags (:standard) diff --git a/src/lib_base/dune b/src/lib_base/dune index ee3679db298f..6d05fe449bb4 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -5,16 +5,16 @@ (library (name tezos_base) - (public_name tezos-base) + (public_name octez-libs.tezos-base) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-crypto + octez-libs.tezos-stdlib + octez-libs.tezos-crypto data-encoding - tezos-error-monad - tezos-rpc - tezos-micheline - tezos-event-logging + octez-libs.tezos-error-monad + octez-libs.tezos-rpc + octez-libs.tezos-micheline + octez-libs.tezos-event-logging ptime ptime.clock.os ezjsonm @@ -31,4 +31,6 @@ -open Tezos_micheline -open Tezos_event_logging)) +(documentation (package octez-libs)) + (ocamllex point_parser) diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index 718a000d124b..35aac0b6aebf 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -4,3 +4,42 @@ This is a package containing some libraries used by the Octez project. It contains the following libraries: +- {{!module-Octez_bls12_381_polynomial}Octez_bls12_381_polynomial} +- {{!module-Polynomial}Polynomial} +- {{!module-Tezos_base}Tezos_base} +- {{!module-Tezos_base_p2p_identity_file}Tezos_base_p2p_identity_file} +- {{!module-Tezos_base_test_helpers}Tezos_base_test_helpers} +- {{!module-Tezos_base_unix}Tezos_base_unix} +- {{!module-Tezos_context}Tezos_context} +- {{!module-Tezos_context_disk}Tezos_context_disk} +- {{!module-Tezos_context_dump}Tezos_context_dump} +- {{!module-Tezos_context_encoding}Tezos_context_encoding} +- {{!module-Tezos_context_helpers}Tezos_context_helpers} +- {{!module-Tezos_context_memory}Tezos_context_memory} +- {{!module-Tezos_context_merkle_proof_encoding}Tezos_context_merkle_proof_encoding} +- {{!module-Tezos_context_sigs}Tezos_context_sigs} +- {{!module-Tezos_crypto}Tezos_crypto} +- {{!module-Tezos_crypto_dal}Tezos_crypto_dal} +- {{!module-Tezos_crypto_dal_octez_dal_config}Tezos_crypto_dal_octez_dal_config} +- {{!module-Tezos_error_monad}Tezos_error_monad} +- {{!module-Tezos_event_logging}Tezos_event_logging} +- {{!module-Tezos_event_logging_test_helpers}Tezos_event_logging_test_helpers} +- {{!module-Tezos_hacl}Tezos_hacl} +- {{!module-Tezos_lazy_containers}Tezos_lazy_containers} +- {{!module-Tezos_micheline}Tezos_micheline} +- {{!module-Tezos_p2p}Tezos_p2p} +- {{!module-Tezos_p2p_services}Tezos_p2p_services} +- {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} +- {{!module-Tezos_rpc}Tezos_rpc} +- {{!module-Tezos_rpc_http}Tezos_rpc_http} +- {{!module-Tezos_rpc_http_client}Tezos_rpc_http_client} +- {{!module-Tezos_rpc_http_client_unix}Tezos_rpc_http_client_unix} +- {{!module-Tezos_rpc_http_server}Tezos_rpc_http_server} +- {{!module-Tezos_shell_services}Tezos_shell_services} +- {{!module-Tezos_stdlib}Tezos_stdlib} +- {{!module-Tezos_stdlib_unix}Tezos_stdlib_unix} +- {{!module-Tezos_tree_encoding}Tezos_tree_encoding} +- {{!module-Tezos_version}Tezos_version} +- {{!module-Tezos_version_parser}Tezos_version_parser} +- {{!module-Tezt_tezos}Tezt_tezos} +- {{!page-tezos_workers}tezos_workers} \ No newline at end of file diff --git a/src/lib_base/p2p_identity_file/dune b/src/lib_base/p2p_identity_file/dune index 776f180cd360..ccd19e5c2379 100644 --- a/src/lib_base/p2p_identity_file/dune +++ b/src/lib_base/p2p_identity_file/dune @@ -3,11 +3,11 @@ (library (name tezos_base_p2p_identity_file) - (public_name tezos-base.p2p-identity-file) + (public_name octez-libs.tezos-base.p2p-identity-file) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix) + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index 148eddb98d46..18bd484ea3c4 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -8,8 +8,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-error-monad + octez-libs.tezos-base + octez-libs.tezos-error-monad data-encoding tezos-test-helpers qcheck-alcotest @@ -43,7 +43,7 @@ (rule (alias runtest) - (package tezos-base) + (package octez-libs) (deps points.ok points.ko) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -64,7 +64,7 @@ (rule (alias runtest_js) - (package tezos-base) + (package octez-libs) (deps points.ok points.ko) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune index 7484d79600a7..406b9c83c963 100644 --- a/src/lib_base/test_helpers/dune +++ b/src/lib_base/test_helpers/dune @@ -3,12 +3,12 @@ (library (name tezos_base_test_helpers) - (public_name tezos-base-test-helpers) + (public_name octez-libs.tezos-base-test-helpers) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-event-logging-test-helpers + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-event-logging-test-helpers tezos-test-helpers octez-alcotezt qcheck-alcotest) diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune index 829d26fee2e3..19dc0fc507e7 100644 --- a/src/lib_base/unix/dune +++ b/src/lib_base/unix/dune @@ -3,18 +3,18 @@ (library (name tezos_base_unix) - (public_name tezos-base.unix) + (public_name octez-libs.tezos-base.unix) (instrumentation (backend bisect_ppx)) (libraries - tezos-error-monad - tezos-crypto - tezos-base - tezos-hacl - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-error-monad + octez-libs.tezos-crypto + octez-libs.tezos-base + octez-libs.tezos-hacl + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix data-encoding uri - tezos-event-logging) + octez-libs.tezos-event-logging) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (flags diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune index 9cdabb82a3de..a3e3bf3432b6 100644 --- a/src/lib_base/unix/test/dune +++ b/src/lib_base/unix/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-error-monad + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-error-monad data-encoding tezos-test-helpers qcheck-alcotest @@ -42,7 +42,7 @@ (rule (alias runtest) - (package tezos-base) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune index 396165dd1bd8..a10cf9a2b49d 100644 --- a/src/lib_benchmark/dune +++ b/src/lib_benchmark/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries str - tezos-base - tezos-stdlib-unix - tezos-crypto - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-micheline tezos-clic data-encoding prbnmcn-linalg diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune index 96a532e3cb8e..2d68cde5f02e 100644 --- a/src/lib_benchmark/example/dune +++ b/src/lib_benchmark/example/dune @@ -6,9 +6,9 @@ (public_name tezos-benchmark-examples) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix - tezos-crypto + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto tezos-benchmark) (flags (:standard) diff --git a/src/lib_benchmark/lib_micheline_rewriting/dune b/src/lib_benchmark/lib_micheline_rewriting/dune index a5f178aa73bd..6c4c7a2a6d87 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/dune @@ -8,10 +8,10 @@ (libraries zarith zarith_stubs_js - tezos-stdlib - tezos-crypto - tezos-error-monad - tezos-micheline) + octez-libs.tezos-stdlib + octez-libs.tezos-crypto + octez-libs.tezos-error-monad + octez-libs.tezos-micheline) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index c43985e60b77..bbacd8451b18 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-micheline + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-alpha - tezos-error-monad + octez-libs.tezos-error-monad tezos-client-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index d5f2dc7dda46..b0259d22cfed 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -7,11 +7,11 @@ (libraries tezt.core octez-alcotezt - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-micheline - tezos-crypto + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-micheline + octez-libs.tezos-crypto tezos-benchmark tezos-benchmark-examples) (library_flags (:standard -linkall)) diff --git a/src/lib_bls12_381_polynomial/dune b/src/lib_bls12_381_polynomial/dune index a5127f194009..75f2c8d4eceb 100644 --- a/src/lib_bls12_381_polynomial/dune +++ b/src/lib_bls12_381_polynomial/dune @@ -3,7 +3,7 @@ (library (name octez_bls12_381_polynomial) - (public_name octez-bls12-381-polynomial) + (public_name octez-libs.octez-bls12-381-polynomial) (instrumentation (backend bisect_ppx)) (libraries bls12-381 diff --git a/src/lib_bls12_381_polynomial/test/dune b/src/lib_bls12_381_polynomial/test/dune index c7c14563d946..c41ddadbe9bd 100644 --- a/src/lib_bls12_381_polynomial/test/dune +++ b/src/lib_bls12_381_polynomial/test/dune @@ -8,9 +8,9 @@ tezt.core octez-alcotezt qcheck-alcotest - octez-polynomial + octez-libs.octez-polynomial bls12-381 - octez-bls12-381-polynomial) + octez-libs.octez-bls12-381-polynomial) (library_flags (:standard -linkall)) (flags (:standard) @@ -37,7 +37,7 @@ (rule (alias runtest) - (package octez-bls12-381-polynomial) + (package octez-libs) (deps srs_zcash_g1_5) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_clic/dune b/src/lib_clic/dune index 7aacb8fcb66c..1a24ebea0565 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -6,10 +6,10 @@ (public_name tezos-clic) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib + octez-libs.tezos-stdlib lwt re - tezos-error-monad + octez-libs.tezos-error-monad tezos-lwt-result-stdlib) (js_of_ocaml) (flags diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index 5a051779be4a..a100dc63c9dd 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib + octez-libs.tezos-stdlib tezos-clic lwt.unix octez-alcotezt) diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index fe5189ee46f8..72974a49f862 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -6,10 +6,10 @@ (public_name tezos-clic.unix) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib + octez-libs.tezos-stdlib tezos-clic - tezos-stdlib-unix - tezos-error-monad + octez-libs.tezos-stdlib-unix + octez-libs.tezos-error-monad tezos-lwt-result-stdlib) (flags (:standard) diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 9232d01b452d..14aeebc782a3 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -8,10 +8,10 @@ (public_name tezos-client-base) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-rpc - tezos-shell-services + octez-libs.tezos-rpc + octez-libs.tezos-shell-services tezos-sapling uri) (js_of_ocaml) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index aea92b18dfad..99f252c12536 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-client-base octez-alcotezt) (js_of_ocaml) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 0076e40f6373..759f3677b49d 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -6,14 +6,14 @@ (public_name tezos-client-base-unix) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic - tezos-rpc - tezos-rpc-http - tezos-rpc-http-client-unix - tezos-shell-services - tezos-stdlib-unix + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-client-unix + octez-libs.tezos-shell-services + octez-libs.tezos-stdlib-unix tezos-client-base tezos-client-commands tezos-mockup diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index e63f5950d11a..04c4615db990 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-mockup-commands tezos-client-base-unix - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 0e9135ad2333..b0d30440eb26 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -6,15 +6,15 @@ (public_name tezos-client-commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc + octez-libs.tezos-base + octez-libs.tezos-rpc tezos-clic tezos-clic.unix tezos-client-base - tezos-shell-services - tezos-p2p-services - tezos-stdlib-unix - tezos-base.unix + octez-libs.tezos-shell-services + octez-libs.tezos-p2p-services + octez-libs.tezos-stdlib-unix + octez-libs.tezos-base.unix tezos-signer-backends data-encoding uri) diff --git a/src/lib_context/disk/dune b/src/lib_context/disk/dune index 78c2c08700c9..4bee93503931 100644 --- a/src/lib_context/disk/dune +++ b/src/lib_context/disk/dune @@ -3,23 +3,23 @@ (library (name tezos_context_disk) - (public_name tezos-context.disk) + (public_name octez-libs.tezos-context.disk) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base bigstringaf fmt irmin irmin-pack irmin-pack.unix logs.fmt - tezos-stdlib-unix - tezos-stdlib - tezos-context.sigs - tezos-context.helpers - tezos-context.encoding - tezos-context.memory - tezos-context.dump) + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-context.sigs + octez-libs.tezos-context.helpers + octez-libs.tezos-context.encoding + octez-libs.tezos-context.memory + octez-libs.tezos-context.dump) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_context/dump/dune b/src/lib_context/dump/dune index f10c89bb3798..a9ada4044f37 100644 --- a/src/lib_context/dump/dune +++ b/src/lib_context/dump/dune @@ -3,11 +3,11 @@ (library (name tezos_context_dump) - (public_name tezos-context.dump) + (public_name octez-libs.tezos-context.dump) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix fmt) (flags (:standard) diff --git a/src/lib_context/dune b/src/lib_context/dune index 317ffd31e7ef..901d10256c12 100644 --- a/src/lib_context/dune +++ b/src/lib_context/dune @@ -3,8 +3,8 @@ (library (name tezos_context) - (public_name tezos-context) + (public_name octez-libs.tezos-context) (instrumentation (backend bisect_ppx)) (libraries - tezos-context.disk - tezos-context.memory)) + octez-libs.tezos-context.disk + octez-libs.tezos-context.memory)) diff --git a/src/lib_context/encoding/dune b/src/lib_context/encoding/dune index 7819ff793273..9d35152f2072 100644 --- a/src/lib_context/encoding/dune +++ b/src/lib_context/encoding/dune @@ -3,11 +3,11 @@ (library (name tezos_context_encoding) - (public_name tezos-context.encoding) + (public_name octez-libs.tezos-context.encoding) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-stdlib irmin irmin-pack) (flags diff --git a/src/lib_context/helpers/dune b/src/lib_context/helpers/dune index 1ed6b6312623..5336086afa08 100644 --- a/src/lib_context/helpers/dune +++ b/src/lib_context/helpers/dune @@ -3,14 +3,14 @@ (library (name tezos_context_helpers) - (public_name tezos-context.helpers) + (public_name octez-libs.tezos-context.helpers) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib - tezos-context.encoding - tezos-context.sigs - tezos-context.merkle_proof_encoding + octez-libs.tezos-base + octez-libs.tezos-stdlib + octez-libs.tezos-context.encoding + octez-libs.tezos-context.sigs + octez-libs.tezos-context.merkle_proof_encoding irmin irmin-pack) (flags diff --git a/src/lib_context/memory/dune b/src/lib_context/memory/dune index 5ae07b96d8d3..e7cc2b354d98 100644 --- a/src/lib_context/memory/dune +++ b/src/lib_context/memory/dune @@ -3,16 +3,16 @@ (library (name tezos_context_memory) - (public_name tezos-context.memory) + (public_name octez-libs.tezos-context.memory) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-stdlib irmin-pack irmin-pack.mem - tezos-context.sigs - tezos-context.encoding - tezos-context.helpers) + octez-libs.tezos-context.sigs + octez-libs.tezos-context.encoding + octez-libs.tezos-context.helpers) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune index 12bf98271b44..9a54c63ecb74 100644 --- a/src/lib_context/memory/test/dune +++ b/src/lib_context/memory/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-context.disk - tezos-context.memory - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-context.disk + octez-libs.tezos-context.memory + octez-libs.tezos-stdlib-unix octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -32,7 +32,7 @@ (rule (alias runtest) - (package tezos-context) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_context/merkle_proof_encoding/dune b/src/lib_context/merkle_proof_encoding/dune index 101452408cff..4ea6fd61a23e 100644 --- a/src/lib_context/merkle_proof_encoding/dune +++ b/src/lib_context/merkle_proof_encoding/dune @@ -5,12 +5,12 @@ (library (name tezos_context_merkle_proof_encoding) - (public_name tezos-context.merkle_proof_encoding) + (public_name octez-libs.tezos-context.merkle_proof_encoding) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib - tezos-context.sigs) + octez-libs.tezos-base + octez-libs.tezos-stdlib + octez-libs.tezos-context.sigs) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_context/sigs/dune b/src/lib_context/sigs/dune index f01f71e5b5be..8863074fe351 100644 --- a/src/lib_context/sigs/dune +++ b/src/lib_context/sigs/dune @@ -5,11 +5,11 @@ (library (name tezos_context_sigs) - (public_name tezos-context.sigs) + (public_name octez-libs.tezos-context.sigs) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib) + octez-libs.tezos-base + octez-libs.tezos-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index 83f86e96779b..d21e05eb5909 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-context.sigs - tezos-context.disk - tezos-context.memory - tezos-context.encoding - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-context.sigs + octez-libs.tezos-context.disk + octez-libs.tezos-context.memory + octez-libs.tezos-context.encoding + octez-libs.tezos-stdlib-unix tezos-test-helpers qcheck-alcotest octez-alcotezt) @@ -37,7 +37,7 @@ (rule (alias runtest) - (package tezos-context) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_crawler/dune b/src/lib_crawler/dune index cb6d08010410..0dd9be76bfc6 100644 --- a/src/lib_crawler/dune +++ b/src/lib_crawler/dune @@ -6,10 +6,10 @@ (public_name octez-crawler) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc-http - tezos-base.unix - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-rpc-http + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix tezos-client-base tezos-shell) (flags diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index e6679a905b37..47777450266f 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -5,17 +5,17 @@ (library (name tezos_crypto) - (public_name tezos-crypto) + (public_name octez-libs.tezos-crypto) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib + octez-libs.tezos-stdlib data-encoding tezos-lwt-result-stdlib lwt - tezos-hacl + octez-libs.tezos-hacl secp256k1-internal - tezos-error-monad - tezos-rpc + octez-libs.tezos-error-monad + octez-libs.tezos-rpc aches zarith zarith_stubs_js diff --git a/src/lib_crypto/test-unix/dune b/src/lib_crypto/test-unix/dune index 32ce59d22e7d..db6679b0fe28 100644 --- a/src/lib_crypto/test-unix/dune +++ b/src/lib_crypto/test-unix/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-crypto - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-crypto + octez-libs.tezos-error-monad zarith zarith_stubs_js - tezos-hacl + octez-libs.tezos-hacl data-encoding octez-alcotezt lwt.unix @@ -40,7 +40,7 @@ (rule (alias runtest) - (package tezos-crypto) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index d61da244d633..e59af56134c4 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -8,12 +8,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-crypto - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-crypto + octez-libs.tezos-error-monad zarith zarith_stubs_js - tezos-hacl + octez-libs.tezos-hacl data-encoding octez-alcotezt qcheck-alcotest @@ -58,7 +58,7 @@ (rule (alias runtest) - (package tezos-crypto) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -78,7 +78,7 @@ (rule (alias runtest_js) - (package tezos-crypto) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_crypto_dal/dal_config/dune b/src/lib_crypto_dal/dal_config/dune index 49e257187bb8..7e0326af6600 100644 --- a/src/lib_crypto_dal/dal_config/dune +++ b/src/lib_crypto_dal/dal_config/dune @@ -3,7 +3,7 @@ (library (name tezos_crypto_dal_octez_dal_config) - (public_name tezos-crypto-dal.octez-dal-config) + (public_name octez-libs.tezos-crypto-dal.octez-dal-config) (instrumentation (backend bisect_ppx)) (libraries data-encoding) diff --git a/src/lib_crypto_dal/dune b/src/lib_crypto_dal/dune index 7ae166d17896..047c3673e9f7 100644 --- a/src/lib_crypto_dal/dune +++ b/src/lib_crypto_dal/dune @@ -3,15 +3,15 @@ (library (name tezos_crypto_dal) - (public_name tezos-crypto-dal) + (public_name octez-libs.tezos-crypto-dal) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad data-encoding - tezos-crypto-dal.octez-dal-config - tezos-crypto - octez-bls12-381-polynomial + octez-libs.tezos-crypto-dal.octez-dal-config + octez-libs.tezos-crypto + octez-libs.octez-bls12-381-polynomial lwt.unix) (flags (:standard) diff --git a/src/lib_crypto_dal/test/dune b/src/lib_crypto_dal/test/dune index 33fb88622e44..017786419cb0 100644 --- a/src/lib_crypto_dal/test/dune +++ b/src/lib_crypto_dal/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-crypto-dal - tezos-crypto-dal.octez-dal-config - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-crypto-dal + octez-libs.tezos-crypto-dal.octez-dal-config + octez-libs.tezos-error-monad data-encoding octez-alcotezt qcheck-alcotest - octez-bls12-381-polynomial + octez-libs.octez-bls12-381-polynomial tezos-test-helpers) (library_flags (:standard -linkall)) (flags @@ -38,7 +38,7 @@ (rule (alias runtest) - (package tezos-crypto-dal) + (package octez-libs) (deps srs_zcash_g1_5 srs_zcash_g2_5) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_dac/dune b/src/lib_dac/dune index 4ec71d5ff881..89e8ef887e9c 100644 --- a/src/lib_dac/dune +++ b/src/lib_dac/dune @@ -6,7 +6,7 @@ (public_name tezos-dac-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-updater) (flags (:standard) diff --git a/src/lib_dac/test/dune b/src/lib_dac/test/dune index 2e0b3dc68114..8f915f032137 100644 --- a/src/lib_dac/test/dune +++ b/src/lib_dac/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-stdlib-unix - tezos-base + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix + octez-libs.tezos-base tezos-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-dac-lib octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_dac_client/dune b/src/lib_dac_client/dune index 284f7239312b..c11e7e4afc31 100644 --- a/src/lib_dac_client/dune +++ b/src/lib_dac_client/dune @@ -6,11 +6,11 @@ (public_name tezos-dac-client-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-client-base tezos-client-base-unix - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dac-lib) (flags (:standard) diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index aeeadad47f6c..35783161984d 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -6,13 +6,13 @@ (package tezos-dac-node-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-client-base tezos-client-base-unix - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos_layer2_store - tezos-rpc-http-server + octez-libs.tezos-rpc-http-server tezos-dac-lib tezos-dac-client-lib) (flags diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune index 0fe664acf021..95c10b72b263 100644 --- a/src/lib_dac_node/test/dune +++ b/src/lib_dac_node/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-stdlib-unix - tezos-base + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix + octez-libs.tezos-base tezos-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos_dac_node_lib octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_dal_node/dune b/src/lib_dal_node/dune index 2d8c840a1a0c..2dc6dfd68ba3 100644 --- a/src/lib_dal_node/dune +++ b/src/lib_dal_node/dune @@ -6,16 +6,16 @@ (public_name tezos-dal-node-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-dal-node-services tezos-client-base tezos-protocol-updater tezos-client-base-unix - tezos-stdlib-unix - tezos-crypto-dal - tezos-p2p - tezos-p2p-services) + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto-dal + octez-libs.tezos-p2p + octez-libs.tezos-p2p-services) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dal_node/gossipsub/dune b/src/lib_dal_node/gossipsub/dune index 7b901748023d..ab1676fb7c1c 100644 --- a/src/lib_dal_node/gossipsub/dune +++ b/src/lib_dal_node/gossipsub/dune @@ -6,12 +6,12 @@ (public_name tezos-dal-node-lib.gossipsub) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-crypto-dal + octez-libs.tezos-base + octez-libs.tezos-crypto-dal tezos-gossipsub - tezos-p2p - tezos-p2p-services - tezos-crypto) + octez-libs.tezos-p2p + octez-libs.tezos-p2p-services + octez-libs.tezos-crypto) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dal_node_services/dune b/src/lib_dal_node_services/dune index 4d4302259e5b..227582c3a08f 100644 --- a/src/lib_dal_node_services/dune +++ b/src/lib_dal_node_services/dune @@ -6,9 +6,9 @@ (public_name tezos-dal-node-services) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc - tezos-crypto-dal) + octez-libs.tezos-base + octez-libs.tezos-rpc + octez-libs.tezos-crypto-dal) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 9ca5d807ecb9..55c6e26e1ebb 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -3,10 +3,10 @@ (library (name tezos_error_monad) - (public_name tezos-error-monad) + (public_name octez-libs.tezos-error-monad) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib + octez-libs.tezos-stdlib data-encoding lwt-canceler lwt diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 0f7955f6cd01..1b90349ef60a 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-error-monad + octez-libs.tezos-error-monad data-encoding octez-alcotezt) (js_of_ocaml) @@ -33,7 +33,7 @@ (rule (alias runtest) - (package tezos-error-monad) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -56,7 +56,7 @@ (rule (alias runtest_js) - (package tezos-error-monad) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune index 8a08efb3e494..a6a51551fa92 100644 --- a/src/lib_event_logging/dune +++ b/src/lib_event_logging/dune @@ -3,12 +3,12 @@ (library (name tezos_event_logging) - (public_name tezos-event-logging) + (public_name octez-libs.tezos-event-logging) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib + octez-libs.tezos-stdlib data-encoding - tezos-error-monad + octez-libs.tezos-error-monad tezos-lwt-result-stdlib uri) (js_of_ocaml) diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune index 430c01590019..4e7c08bb3e8c 100644 --- a/src/lib_event_logging/test_helpers/dune +++ b/src/lib_event_logging/test_helpers/dune @@ -3,13 +3,13 @@ (library (name tezos_event_logging_test_helpers) - (public_name tezos-event-logging-test-helpers) + (public_name octez-libs.tezos-event-logging-test-helpers) (libraries - tezos-stdlib + octez-libs.tezos-stdlib tezos-lwt-result-stdlib data-encoding - tezos-error-monad - tezos-event-logging + octez-libs.tezos-error-monad + octez-libs.tezos-event-logging tezos-test-helpers octez-alcotezt) (js_of_ocaml) diff --git a/src/lib_gossipsub/dune b/src/lib_gossipsub/dune index e26de344fb18..31b8ad76727e 100644 --- a/src/lib_gossipsub/dune +++ b/src/lib_gossipsub/dune @@ -9,12 +9,12 @@ ringo aches fmt - tezos-error-monad - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-stdlib - tezos-version) + octez-libs.tezos-error-monad + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-version) (flags (:standard) -open Tezos_error_monad diff --git a/src/lib_gossipsub/test/dune b/src/lib_gossipsub/test/dune index 88681393f2f5..fb49e49ea5de 100644 --- a/src/lib_gossipsub/test/dune +++ b/src/lib_gossipsub/test/dune @@ -5,8 +5,8 @@ (name test_gossipsub) (libraries fmt - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-gossipsub tezt qcheck-core diff --git a/src/lib_hacl/dune b/src/lib_hacl/dune index 8e52f3893c91..9512e7629092 100644 --- a/src/lib_hacl/dune +++ b/src/lib_hacl/dune @@ -5,7 +5,7 @@ (library (name tezos_hacl) - (public_name tezos-hacl) + (public_name octez-libs.tezos-hacl) (instrumentation (backend bisect_ppx)) (libraries hacl-star diff --git a/src/lib_hacl/gen/dune b/src/lib_hacl/gen/dune index 20b71609231a..ae4444049d09 100644 --- a/src/lib_hacl/gen/dune +++ b/src/lib_hacl/gen/dune @@ -30,10 +30,10 @@ (rule (alias runtest_js) (target api.json.corrected) - (package tezos-hacl) + (package octez-libs) (action (setenv NODE_PRELOAD hacl-wasm (run node %{dep:./check-api.js})))) (rule (alias runtest_js) - (package tezos-hacl) + (package octez-libs) (action (diff api.json api.json.corrected))) diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune index dc75e64c5142..2ca3980c1ef2 100644 --- a/src/lib_hacl/test/dune +++ b/src/lib_hacl/test/dune @@ -8,13 +8,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad tezos-lwt-result-stdlib zarith zarith_stubs_js data-encoding - tezos-hacl + octez-libs.tezos-hacl qcheck-alcotest octez-alcotezt tezos-test-helpers) @@ -50,7 +50,7 @@ (rule (alias runtest) - (package tezos-hacl) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -70,7 +70,7 @@ (rule (alias runtest_js) - (package tezos-hacl) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_injector/dune b/src/lib_injector/dune index 35314fb771bf..0f6ae1186538 100644 --- a/src/lib_injector/dune +++ b/src/lib_injector/dune @@ -6,14 +6,14 @@ (public_name octez-injector) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base logs.lwt - tezos-base.unix - tezos-stdlib-unix - tezos-crypto - tezos-micheline + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-micheline tezos-client-base - tezos-workers + octez-libs.tezos-workers tezos-shell octez-crawler) (flags diff --git a/src/lib_layer2_store/dune b/src/lib_layer2_store/dune index 70f9934f1492..95d8164c46cb 100644 --- a/src/lib_layer2_store/dune +++ b/src/lib_layer2_store/dune @@ -7,13 +7,13 @@ (instrumentation (backend bisect_ppx)) (libraries index - tezos-base + octez-libs.tezos-base irmin-pack irmin-pack.unix irmin aches-lwt - tezos-stdlib-unix - tezos-context.encoding) + octez-libs.tezos-stdlib-unix + octez-libs.tezos-context.encoding) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune index 75ce8b120378..a43ba892b7f9 100644 --- a/src/lib_layer2_store/test/dune +++ b/src/lib_layer2_store/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-error-monad + octez-libs.tezos-error-monad tezos_layer2_store qcheck-alcotest octez-alcotezt) diff --git a/src/lib_lazy_containers/dune b/src/lib_lazy_containers/dune index 484711152ce5..aebc6053dbfc 100644 --- a/src/lib_lazy_containers/dune +++ b/src/lib_lazy_containers/dune @@ -3,8 +3,8 @@ (library (name tezos_lazy_containers) - (public_name tezos-lazy-containers) + (public_name octez-libs.tezos-lazy-containers) (instrumentation (backend bisect_ppx)) (libraries zarith - tezos-tree-encoding)) + octez-libs.tezos-tree-encoding)) diff --git a/src/lib_lazy_containers/test/dune b/src/lib_lazy_containers/test/dune index 921bf1162921..98fda0e2013f 100644 --- a/src/lib_lazy_containers/test/dune +++ b/src/lib_lazy_containers/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-lazy-containers + octez-libs.tezos-lazy-containers qcheck-core qcheck-alcotest lwt.unix diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index 6f3802fedc35..191904f1abe1 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -3,14 +3,14 @@ (library (name tezos_micheline) - (public_name tezos-micheline) + (public_name octez-libs.tezos-micheline) (instrumentation (backend bisect_ppx)) (libraries uutf zarith zarith_stubs_js - tezos-stdlib - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad data-encoding) (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_expect)) diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune index c1cc00b9a1e9..31762daa75dd 100644 --- a/src/lib_micheline/test/dune +++ b/src/lib_micheline/test/dune @@ -3,10 +3,10 @@ (library (name test_parser) - (package tezos-micheline) + (package octez-libs) (instrumentation (backend bisect_ppx)) (libraries - tezos-micheline) + octez-libs.tezos-micheline) (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_expect)) (js_of_ocaml) @@ -17,10 +17,10 @@ (library (name test_diff) - (package tezos-micheline) + (package octez-libs) (instrumentation (backend bisect_ppx)) (libraries - tezos-micheline) + octez-libs.tezos-micheline) (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_expect)) (js_of_ocaml) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index e796914cbacb..63b37fcd11ee 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -6,9 +6,9 @@ (public_name tezos-mockup-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base - tezos-shell-services + octez-libs.tezos-shell-services tezos-protocol-environment uri) (flags @@ -21,18 +21,18 @@ (public_name tezos-mockup) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-client-base tezos-mockup-proxy resto-cohttp-self-serving-client - tezos-rpc - tezos-p2p-services - tezos-p2p + octez-libs.tezos-rpc + octez-libs.tezos-p2p-services + octez-libs.tezos-p2p tezos-protocol-environment - tezos-stdlib-unix - tezos-rpc-http - tezos-rpc-http-client + octez-libs.tezos-stdlib-unix + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-client tezos-mockup-registration) (flags (:standard) @@ -51,7 +51,7 @@ (public_name tezos-mockup-commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-client-commands tezos-client-base diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 05ff497bc757..246bb50fb29f 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers tezos-test-helpers - tezos-rpc + octez-libs.tezos-rpc tezos-mockup tezos-mockup-registration tezos-client-base diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index 8f8e0f1c89b4..a33de1698708 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -6,13 +6,13 @@ (public_name tezos-mockup-proxy) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base tezos-protocol-environment - tezos-rpc-http + octez-libs.tezos-rpc-http resto-cohttp-self-serving-client - tezos-rpc-http-client - tezos-shell-services + octez-libs.tezos-rpc-http-client + octez-libs.tezos-shell-services uri) (flags (:standard) diff --git a/src/lib_node_config/dune b/src/lib_node_config/dune index b2ad38fcae2d..f4a45cc67443 100644 --- a/src/lib_node_config/dune +++ b/src/lib_node_config/dune @@ -6,13 +6,13 @@ (public_name octez-node-config) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-shell-services - tezos-rpc-http - tezos-rpc-http-server - tezos-context + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-shell-services + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server + octez-libs.tezos-context tezos-store tezos-validation) (flags diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune index 42a068dcd54f..bde1f4b880e6 100644 --- a/src/lib_p2p/dune +++ b/src/lib_p2p/dune @@ -3,21 +3,21 @@ (library (name tezos_p2p) - (public_name tezos-p2p) + (public_name octez-libs.tezos-p2p) (instrumentation (backend bisect_ppx)) (libraries lwt-watcher lwt-canceler ringo aches - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-stdlib - tezos-p2p-services - tezos-version + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-p2p-services + octez-libs.tezos-version prometheus - tezos-base.p2p-identity-file) + octez-libs.tezos-base.p2p-identity-file) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_p2p/test/common/dune b/src/lib_p2p/test/common/dune index 45f8fb737532..bc365c0e15aa 100644 --- a/src/lib_p2p/test/common/dune +++ b/src/lib_p2p/test/common/dune @@ -3,16 +3,16 @@ (library (name tezos_p2p_test_common) - (package tezos-p2p) + (public_name octez-libs.tezos_p2p_test_common) (instrumentation (backend bisect_ppx)) (libraries tezt - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-stdlib - tezos-p2p - tezos-p2p-services) + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-p2p + octez-libs.tezos-p2p-services) (flags (:standard) -open Tezt diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index 3583a1435147..31cdd617a4b4 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -15,17 +15,17 @@ test_p2p_maintenance) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-stdlib - tezos-p2p + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-p2p tezos-test-helpers - tezos-base-test-helpers - tezos-event-logging-test-helpers - tezos_p2p_test_common - tezos-p2p-services - tezt-tezos + octez-libs.tezos-base-test-helpers + octez-libs.tezos-event-logging-test-helpers + octez-libs.tezos_p2p_test_common + octez-libs.tezos-p2p-services + octez-libs.tezt-tezos tezt octez-alcotezt astring) @@ -44,60 +44,60 @@ (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_socket.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_pool.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_broadcast.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_io_scheduler.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_peerset.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_buffer_reader.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_banned_peers.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_node.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_connect_handler.exe}))) (rule (alias runtest) - (package tezos-p2p) + (package octez-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 09c78a2457c4..213861506714 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -6,16 +6,16 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-stdlib - tezos-p2p - tezos-p2p-services + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-p2p + octez-libs.tezos-p2p-services tezos-test-helpers - tezos-base-test-helpers - tezos-event-logging-test-helpers - tezos_p2p_test_common) + octez-libs.tezos-base-test-helpers + octez-libs.tezos-event-logging-test-helpers + octez-libs.tezos_p2p_test_common) (library_flags (:standard -linkall)) (flags (:standard) @@ -42,7 +42,7 @@ (rule (alias runtest) - (package tezos-p2p) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune index f122b4b34e2e..6d706385af3a 100644 --- a/src/lib_p2p_services/dune +++ b/src/lib_p2p_services/dune @@ -5,11 +5,11 @@ (library (name tezos_p2p_services) - (public_name tezos-p2p-services) + (public_name octez-libs.tezos-p2p-services) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc) + octez-libs.tezos-base + octez-libs.tezos-rpc) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_plompiler/dune b/src/lib_plompiler/dune index 290b55e21157..c9f35b8069e8 100644 --- a/src/lib_plompiler/dune +++ b/src/lib_plompiler/dune @@ -10,6 +10,6 @@ stdint hacl-star octez-bls12-381-hash - octez-polynomial + octez-libs.octez-polynomial octez-mec) (preprocess (staged_pps ppx_repr ppx_deriving.show))) diff --git a/src/lib_plonk/dune b/src/lib_plonk/dune index 6b4a57f0602f..43fe31c09d40 100644 --- a/src/lib_plonk/dune +++ b/src/lib_plonk/dune @@ -9,7 +9,7 @@ repr hacl-star data-encoding - octez-bls12-381-polynomial + octez-libs.octez-bls12-381-polynomial octez-plompiler str) (preprocess (pps ppx_repr)) diff --git a/src/lib_plonk/test/dune b/src/lib_plonk/test/dune index 54f8f2c09b93..7b251b6aba55 100644 --- a/src/lib_plonk/test/dune +++ b/src/lib_plonk/test/dune @@ -36,7 +36,7 @@ (libraries octez-plonk.plonk-test qcheck-alcotest - octez-bls12-381-polynomial) + octez-libs.octez-bls12-381-polynomial) (flags (:standard) -open Octez_bls12_381_polynomial) diff --git a/src/lib_polynomial/dune b/src/lib_polynomial/dune index 07b36641ac1f..9dde4ad109c8 100644 --- a/src/lib_polynomial/dune +++ b/src/lib_polynomial/dune @@ -3,7 +3,7 @@ (library (name polynomial) - (public_name octez-polynomial) + (public_name octez-libs.octez-polynomial) (instrumentation (backend bisect_ppx)) (libraries bls12-381 diff --git a/src/lib_polynomial/test/dune b/src/lib_polynomial/test/dune index 9a9b01644167..9603cdc8aedd 100644 --- a/src/lib_polynomial/test/dune +++ b/src/lib_polynomial/test/dune @@ -9,7 +9,7 @@ bls12-381 octez-mec octez-alcotezt - octez-polynomial) + octez-libs.octez-polynomial) (library_flags (:standard -linkall)) (flags (:standard) @@ -28,7 +28,7 @@ (rule (alias runtest) - (package octez-polynomial) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune index 2ca1c5317e16..03407500dbb6 100644 --- a/src/lib_protocol_compiler/bin/dune +++ b/src/lib_protocol_compiler/bin/dune @@ -29,8 +29,8 @@ (package octez-protocol-compiler) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix octez-protocol-compiler) (link_flags (:standard) @@ -49,9 +49,9 @@ (instrumentation (backend bisect_ppx)) (modes native) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix) + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 1e08e638d530..c618c0c60471 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-compiler) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-protocol-environment.sigs - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix compiler-libs.common lwt.unix ocplib-ocamlres @@ -74,7 +74,7 @@ (public_name octez-protocol-compiler.native) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler compiler-libs.optcomp) (flags diff --git a/src/lib_protocol_compiler/registerer/dune b/src/lib_protocol_compiler/registerer/dune index e7bd78c12361..b766764b5775 100644 --- a/src/lib_protocol_compiler/registerer/dune +++ b/src/lib_protocol_compiler/registerer/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-compiler.registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment.sigs) (flags (:standard) diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune index 8a1e5b7a7320..df85edb24899 100644 --- a/src/lib_protocol_environment/context_ops/dune +++ b/src/lib_protocol_environment/context_ops/dune @@ -6,10 +6,10 @@ (public_name tezos-context-ops) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-error-monad + octez-libs.tezos-base + octez-libs.tezos-error-monad tezos-protocol-environment - tezos-context + octez-libs.tezos-context tezos-shell-context) (flags (:standard) diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index 8c95e6215a89..91b1d551565a 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -10,18 +10,18 @@ zarith_stubs_js bls12-381 octez-plonk - tezos-crypto-dal + octez-libs.tezos-crypto-dal class_group_vdf aches aches-lwt - tezos-base + octez-libs.tezos-base tezos-sapling tezos-protocol-environment.sigs tezos-protocol-environment.structs - tezos-micheline - tezos-context.memory + octez-libs.tezos-micheline + octez-libs.tezos-context.memory tezos-scoru-wasm - tezos-event-logging) + octez-libs.tezos-event-logging) (flags (:standard) -open Plonk diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune index 624fb9352e71..86c91c06d27b 100644 --- a/src/lib_protocol_environment/shell_context/dune +++ b/src/lib_protocol_environment/shell_context/dune @@ -6,9 +6,9 @@ (public_name tezos-shell-context) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment - tezos-context) + octez-libs.tezos-context) (flags (:standard) -open Tezos_base.TzPervasives)) diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 9bf776a36493..89faa5889dcd 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -6,8 +6,8 @@ (public_name tezos-protocol-environment.structs) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-crypto + octez-libs.tezos-stdlib + octez-libs.tezos-crypto tezos-lwt-result-stdlib tezos-scoru-wasm data-encoding diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index efdddcba9af5..5180302fc29b 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-protocol-environment octez-alcotezt tezos-test-helpers diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index 1d652f463f13..caff2f16e7c1 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -9,7 +9,7 @@ tezos-shell-context octez-alcotezt tezos-test-helpers - tezos-base + octez-libs.tezos-base tezos-protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index c7f59bcac4f3..afbc752d0f53 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -6,15 +6,15 @@ (public_name tezos-protocol-updater) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix - tezos-micheline - tezos-shell-services + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix + octez-libs.tezos-micheline + octez-libs.tezos-shell-services tezos-protocol-environment tezos-shell-context octez-protocol-compiler.registerer octez-protocol-compiler.native - tezos-context + octez-libs.tezos-context lwt-exit dynlink) (flags diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index 66cd9adc91a9..a3269ff906c0 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -8,13 +8,13 @@ (libraries aches aches-lwt - tezos-base + octez-libs.tezos-base tezos-clic tezos-client-base tezos-protocol-environment - tezos-rpc - tezos-shell-services - tezos-context.memory + octez-libs.tezos-rpc + octez-libs.tezos-shell-services + octez-libs.tezos-context.memory uri) (flags (:standard) diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune index 6028ed4d0853..7986c10b310b 100644 --- a/src/lib_proxy/rpc/dune +++ b/src/lib_proxy/rpc/dune @@ -6,10 +6,10 @@ (public_name tezos-proxy.rpc) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base tezos-mockup-proxy - tezos-rpc + octez-libs.tezos-rpc tezos-proxy uri) (flags diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index c958c42d044a..799b1804240c 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix tezos-proxy - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-test-helpers tezos_proxy_test_helpers_shell_services qcheck-alcotest diff --git a/src/lib_proxy/test_helpers/shell_services/dune b/src/lib_proxy/test_helpers/shell_services/dune index 5cfc0eff4a8f..5927cc655909 100644 --- a/src/lib_proxy/test_helpers/shell_services/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -4,11 +4,11 @@ (library (name tezos_proxy_test_helpers_shell_services) (libraries - tezos-base - tezos-shell-services + octez-libs.tezos-base + octez-libs.tezos-shell-services tezos-test-helpers qcheck-core - tezos-context.memory + octez-libs.tezos-context.memory lwt.unix octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index 93ed4a083bdc..66e5c36226c6 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-test-helpers - tezos-shell-services + octez-libs.tezos-shell-services tezos_proxy_test_helpers_shell_services qcheck-alcotest octez-alcotezt) diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune index 026cc437f66a..74367086f702 100644 --- a/src/lib_proxy_server_config/dune +++ b/src/lib_proxy_server_config/dune @@ -6,8 +6,8 @@ (public_name tezos-proxy-server-config) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix uri) (flags (:standard) diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune index 11d6979570d6..c01f344f1944 100644 --- a/src/lib_proxy_server_config/test/dune +++ b/src/lib_proxy_server_config/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-proxy-server-config tezos-test-helpers qcheck-alcotest diff --git a/src/lib_requester/dune b/src/lib_requester/dune index 3a59ba3da0b5..b494dbfe1997 100644 --- a/src/lib_requester/dune +++ b/src/lib_requester/dune @@ -6,8 +6,8 @@ (public_name tezos-requester) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix lwt-watcher) (flags (:standard) diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune index 79cc6b8fb7a9..26ce6bf369ee 100644 --- a/src/lib_requester/test/dune +++ b/src/lib_requester/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-test-helpers - tezos-base-test-helpers - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-base-test-helpers + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix tezos-requester octez-alcotezt qcheck-alcotest) diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index b17c0d099546..094efd228c19 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -3,11 +3,11 @@ (library (name tezos_rpc) - (public_name tezos-rpc) + (public_name octez-libs.tezos-rpc) (instrumentation (backend bisect_ppx)) (libraries data-encoding - tezos-error-monad + octez-libs.tezos-error-monad resto resto-directory uri) diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune index 1db6a874a13c..b76b01637e5f 100644 --- a/src/lib_rpc_http/dune +++ b/src/lib_rpc_http/dune @@ -3,11 +3,11 @@ (library (name tezos_rpc_http) - (public_name tezos-rpc-http) + (public_name octez-libs.tezos-rpc-http) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc + octez-libs.tezos-base + octez-libs.tezos-rpc resto-cohttp uri) (flags @@ -17,13 +17,13 @@ (library (name tezos_rpc_http_client) - (public_name tezos-rpc-http-client) + (public_name octez-libs.tezos-rpc-http-client) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base resto-cohttp-client - tezos-rpc - tezos-rpc-http) + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http) (flags (:standard) -open Tezos_base.TzPervasives @@ -32,15 +32,15 @@ (library (name tezos_rpc_http_client_unix) - (public_name tezos-rpc-http-client-unix) + (public_name octez-libs.tezos-rpc-http-client-unix) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib-unix - tezos-base + octez-libs.tezos-stdlib-unix + octez-libs.tezos-base cohttp-lwt-unix resto-cohttp-client - tezos-rpc - tezos-rpc-http-client) + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http-client) (flags (:standard) -open Tezos_base.TzPervasives @@ -49,16 +49,16 @@ (library (name tezos_rpc_http_server) - (public_name tezos-rpc-http-server) + (public_name octez-libs.tezos-rpc-http-server) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix cohttp-lwt-unix resto-cohttp-server resto-acl - tezos-rpc - tezos-rpc-http) + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune index a01a9618a9da..70fa8f64c27a 100644 --- a/src/lib_rpc_http/test/dune +++ b/src/lib_rpc_http/test/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix tezos-test-helpers - tezos-base-test-helpers - tezos-rpc-http-server + octez-libs.tezos-base-test-helpers + octez-libs.tezos-rpc-http-server qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -38,7 +38,7 @@ (rule (alias runtest) - (package tezos-rpc-http-server) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune index 2b9107077673..57e893d7b012 100644 --- a/src/lib_sapling/dune +++ b/src/lib_sapling/dune @@ -13,9 +13,9 @@ ctypes ctypes_stubs_js data-encoding - tezos-stdlib - tezos-crypto - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-crypto + octez-libs.tezos-error-monad tezos-lwt-result-stdlib) (js_of_ocaml (javascript_files runtime.js)) (flags diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index c957cee7aa17..6039198cc269 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -9,14 +9,14 @@ (libraries tezt.core tezos-sapling - tezos-crypto + octez-libs.tezos-crypto str - tezos-base - tezos-base.unix - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix data-encoding - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -42,7 +42,7 @@ (modes js) (libraries tezos-sapling - tezos-hacl) + octez-libs.tezos-hacl) (js_of_ocaml) (link_flags (:standard) diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune index 05361fbd177d..86a4bf7d2dec 100644 --- a/src/lib_scoru_sequencer/dune +++ b/src/lib_scoru_sequencer/dune @@ -6,16 +6,16 @@ (package octez-smart-rollup-sequencer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-smart-rollup-layer2-alpha tezos-protocol-alpha octez_smart_rollup_node_alpha - tezos-workers + octez-libs.tezos-workers octez-smart-rollup-node-lib octez-smart-rollup - tezos-rpc - tezos-rpc-http - tezos-rpc-http-server) + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server) (flags (:standard) -open Tezos_base diff --git a/src/lib_scoru_sequencer/test/dune b/src/lib_scoru_sequencer/test/dune index 6727855a379e..5cf61f807b44 100644 --- a/src/lib_scoru_sequencer/test/dune +++ b/src/lib_scoru_sequencer/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-protocol-alpha octez_smart_rollup_sequencer - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-test-helpers qcheck-alcotest octez-alcotezt) diff --git a/src/lib_scoru_wasm/bench/dune b/src/lib_scoru_wasm/bench/dune index a78b30a04062..bbe945a6bf3c 100644 --- a/src/lib_scoru_wasm/bench/dune +++ b/src/lib_scoru_wasm/bench/dune @@ -6,10 +6,10 @@ (package octez-smart-rollup-wasm-benchmark-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezt tezos-webassembly-interpreter - tezos-context.memory + octez-libs.tezos-context.memory tezos-scoru-wasm tezos-scoru-wasm-helpers lwt.unix) diff --git a/src/lib_scoru_wasm/bench/executable/dune b/src/lib_scoru_wasm/bench/executable/dune index fcd27e9926d5..c3fa84e97fc4 100644 --- a/src/lib_scoru_wasm/bench/executable/dune +++ b/src/lib_scoru_wasm/bench/executable/dune @@ -5,7 +5,7 @@ (name octez_smart_rollup_wasm_benchmark) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez_smart_rollup_wasm_benchmark_lib) (preprocess (pps ppx_deriving.show)) (flags diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index e6a46acbd9bf..3567d4ac5af8 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -6,12 +6,12 @@ (public_name tezos-scoru-wasm) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-tree-encoding - tezos-lazy-containers + octez-libs.tezos-base + octez-libs.tezos-tree-encoding + octez-libs.tezos-lazy-containers tezos-webassembly-interpreter - tezos-context.sigs - tezos-context.memory + octez-libs.tezos-context.sigs + octez-libs.tezos-context.memory tezos-lwt-result-stdlib data-encoding) (flags diff --git a/src/lib_scoru_wasm/fast/dune b/src/lib_scoru_wasm/fast/dune index 7dbd84507089..0990deb02828 100644 --- a/src/lib_scoru_wasm/fast/dune +++ b/src/lib_scoru_wasm/fast/dune @@ -6,10 +6,10 @@ (public_name tezos-scoru-wasm-fast) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-tree-encoding + octez-libs.tezos-base + octez-libs.tezos-tree-encoding tezos-webassembly-interpreter - tezos-lazy-containers + octez-libs.tezos-lazy-containers tezos-scoru-wasm tezos-wasmer) (flags diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune index 6f73ab4774f4..0fe5b51c1b30 100644 --- a/src/lib_scoru_wasm/fast/test/dune +++ b/src/lib_scoru_wasm/fast/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-tree-encoding - tezos-base.unix - tezos-context.disk - tezos-base-test-helpers + octez-libs.tezos-base + octez-libs.tezos-tree-encoding + 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 tezos-test-helpers diff --git a/src/lib_scoru_wasm/helpers/dune b/src/lib_scoru_wasm/helpers/dune index c0ad516e297d..671ff59af607 100644 --- a/src/lib_scoru_wasm/helpers/dune +++ b/src/lib_scoru_wasm/helpers/dune @@ -6,10 +6,10 @@ (public_name tezos-scoru-wasm-helpers) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-tree-encoding - tezos-base.unix - tezos-context.disk + octez-libs.tezos-base + octez-libs.tezos-tree-encoding + octez-libs.tezos-base.unix + octez-libs.tezos-context.disk tezos-scoru-wasm tezos-scoru-wasm-fast tezos-webassembly-interpreter-extra) diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune index 4fe6e6dbb388..b6a0170713c2 100644 --- a/src/lib_scoru_wasm/regressions/dune +++ b/src/lib_scoru_wasm/regressions/dune @@ -6,7 +6,7 @@ (package tezos-scoru-wasm-regressions) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-scoru-wasm tezos-scoru-wasm-helpers tezos-test-helpers diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune index b58c0cda29b1..22eb736f7c5d 100644 --- a/src/lib_scoru_wasm/test/dune +++ b/src/lib_scoru_wasm/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-tree-encoding - tezos-base.unix - tezos-context.disk - tezos-base-test-helpers + octez-libs.tezos-base + octez-libs.tezos-tree-encoding + octez-libs.tezos-base.unix + octez-libs.tezos-context.disk + octez-libs.tezos-base-test-helpers tezos-test-helpers tezos-scoru-wasm qcheck-alcotest diff --git a/src/lib_scoru_wasm/test/durable_snapshot/dune b/src/lib_scoru_wasm/test/durable_snapshot/dune index 578183cae88a..34b957e7da7c 100644 --- a/src/lib_scoru_wasm/test/durable_snapshot/dune +++ b/src/lib_scoru_wasm/test/durable_snapshot/dune @@ -6,8 +6,8 @@ (package tezos-scoru-wasm-durable-snapshot) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-tree-encoding + octez-libs.tezos-base + octez-libs.tezos-tree-encoding tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags diff --git a/src/lib_scoru_wasm/test/helpers/dune b/src/lib_scoru_wasm/test/helpers/dune index 11f75c020c41..1837fae515ef 100644 --- a/src/lib_scoru_wasm/test/helpers/dune +++ b/src/lib_scoru_wasm/test/helpers/dune @@ -6,11 +6,11 @@ (package tezos-scoru-wasm-test-helpers) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-tree-encoding - tezos-base.unix - tezos-context.disk - tezos-base-test-helpers + octez-libs.tezos-base + octez-libs.tezos-tree-encoding + octez-libs.tezos-base.unix + octez-libs.tezos-context.disk + octez-libs.tezos-base-test-helpers tezos-test-helpers tezos-scoru-wasm tezos_scoru_wasm_durable_snapshot diff --git a/src/lib_shell/dune b/src/lib_shell/dune index e5d54e331de6..5685f69d3ca0 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -9,25 +9,25 @@ lwt-watcher lwt-canceler prometheus - tezos-base - tezos-base.unix - tezos-rpc - tezos-context + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-rpc + octez-libs.tezos-context tezos-store tezos-store.shared tezos-protocol-environment tezos-context-ops tezos-shell-context - tezos-p2p - tezos-stdlib-unix - tezos-shell-services - tezos-p2p-services + octez-libs.tezos-p2p + octez-libs.tezos-stdlib-unix + octez-libs.tezos-shell-services + octez-libs.tezos-p2p-services tezos-protocol-updater tezos-requester - tezos-workers + octez-libs.tezos-workers tezos-validation - tezos-version - tezos-crypto-dal.octez-dal-config + octez-libs.tezos-version + octez-libs.tezos-crypto-dal.octez-dal-config lwt-exit) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 4ef810e6db5b..c41d37ce8d06 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -6,23 +6,23 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers tezos-store tezos-store.shared - tezos-context + octez-libs.tezos-context tezos-context-ops tezos-shell-context tezos-protocol-updater - tezos-p2p - tezos-p2p-services + octez-libs.tezos-p2p + octez-libs.tezos-p2p-services tezos-requester tezos-shell - tezos-shell-services + octez-libs.tezos-shell-services tezos-embedded-protocol-demo-noops - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-validation - tezos-event-logging-test-helpers + octez-libs.tezos-event-logging-test-helpers tezos-test-helpers octez-alcotezt tezos-version.value) diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune index 28b9b32120c4..edf338748ddc 100644 --- a/src/lib_shell_benchmarks/dune +++ b/src/lib_shell_benchmarks/dune @@ -6,14 +6,14 @@ (public_name tezos-shell-benchmarks) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-base - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad tezos-benchmark - tezos-crypto - tezos-context + octez-libs.tezos-crypto + octez-libs.tezos-context tezos-shell-context - tezos-micheline) + octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune index 8fd6fe09da75..bba5e5ae85cf 100644 --- a/src/lib_shell_services/dune +++ b/src/lib_shell_services/dune @@ -5,16 +5,16 @@ (library (name tezos_shell_services) - (public_name tezos-shell-services) + (public_name octez-libs.tezos-shell-services) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc - tezos-p2p-services - tezos-version - tezos-context.sigs - tezos-context.merkle_proof_encoding - tezos-crypto-dal.octez-dal-config) + octez-libs.tezos-base + octez-libs.tezos-rpc + octez-libs.tezos-p2p-services + octez-libs.tezos-version + octez-libs.tezos-context.sigs + octez-libs.tezos-context.merkle_proof_encoding + octez-libs.tezos-crypto-dal.octez-dal-config) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index 1d113c8ccaf1..bc60905d5fe9 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -8,8 +8,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-shell-services + octez-libs.tezos-base + octez-libs.tezos-shell-services octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) @@ -33,7 +33,7 @@ (rule (alias runtest) - (package tezos-shell-services) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -53,7 +53,7 @@ (rule (alias runtest_js) - (package tezos-shell-services) + (package octez-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 69f8b4915ba9..25cdd0945380 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -6,13 +6,13 @@ (public_name tezos-signer-backends) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-stdlib tezos-client-base - tezos-rpc-http - tezos-rpc-http-client + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-client tezos-signer-services - tezos-shell-services + octez-libs.tezos-shell-services uri) (flags (:standard) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index 1d40c19677fd..b661922ff448 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base.unix - tezos-stdlib - tezos-error-monad - tezos-crypto + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad + octez-libs.tezos-crypto tezos-client-base tezos-signer-backends octez-alcotezt diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 93e33b9bfac5..15fbcd347596 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -8,18 +8,18 @@ (libraries ocplib-endian.bigstring fmt - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-clic - tezos-stdlib-unix - tezos-stdlib + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib tezos-client-base - tezos-rpc-http - tezos-rpc-http-client - tezos-rpc-http-client-unix + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-client + octez-libs.tezos-rpc-http-client-unix tezos-signer-services tezos-signer-backends - tezos-shell-services + octez-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 1a33187268e0..9aa37139e8aa 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-error-monad - tezos-stdlib - tezos-crypto + octez-libs.tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-crypto tezos-client-base tezos-signer-backends.unix octez-alcotezt) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index 020927621f69..b34a5985a2f8 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -8,8 +8,8 @@ (public_name tezos-signer-services) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-rpc + octez-libs.tezos-base + octez-libs.tezos-rpc tezos-client-base) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_smart_rollup/dune b/src/lib_smart_rollup/dune index 780eb1767e56..18459aaba35a 100644 --- a/src/lib_smart_rollup/dune +++ b/src/lib_smart_rollup/dune @@ -6,11 +6,11 @@ (public_name octez-smart-rollup) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-crypto - tezos-crypto-dal) + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-crypto-dal) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune index aa095183fd57..d6cdfc245885 100644 --- a/src/lib_smart_rollup_node/dune +++ b/src/lib_smart_rollup_node/dune @@ -6,10 +6,10 @@ (public_name octez-smart-rollup-node-lib) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-base.unix - tezos-stdlib-unix - tezos-crypto + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto tezos-client-base tezos-client-base-unix cohttp-lwt-unix @@ -22,7 +22,7 @@ tezos-version.value tezos_layer2_store octez-crawler - tezos-workers + octez-libs.tezos-workers octez-smart-rollup) (flags (:standard) diff --git a/src/lib_srs_extraction/dune b/src/lib_srs_extraction/dune index feedbbbbc0f1..44fd610a9c30 100644 --- a/src/lib_srs_extraction/dune +++ b/src/lib_srs_extraction/dune @@ -6,7 +6,7 @@ (public_name octez-srs-extraction) (libraries bls12-381 - octez-bls12-381-polynomial) + octez-libs.octez-bls12-381-polynomial) (flags (:standard) -open Octez_bls12_381_polynomial) @@ -19,7 +19,7 @@ cmdliner unix bls12-381 - octez-bls12-381-polynomial) + octez-libs.octez-bls12-381-polynomial) (flags (:standard) -open Octez_srs_extraction diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index 78926ff015ba..8f505d43dc18 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -3,7 +3,7 @@ (library (name tezos_stdlib) - (public_name tezos-stdlib) + (public_name octez-libs.tezos-stdlib) (instrumentation (backend bisect_ppx)) (libraries hex diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune index c7efe447f949..a6c7f10d44ee 100644 --- a/src/lib_stdlib/test-unix/dune +++ b/src/lib_stdlib/test-unix/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib + octez-libs.tezos-stdlib octez-alcotezt bigstring lwt.unix @@ -36,7 +36,7 @@ (rule (alias runtest) - (package tezos-stdlib) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index 34fe63118a5b..7532a76eefd5 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib + octez-libs.tezos-stdlib octez-alcotezt bigstring tezos-test-helpers @@ -45,7 +45,7 @@ (rule (alias runtest) - (package tezos-stdlib) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -68,7 +68,7 @@ (rule (alias runtest_js) - (package tezos-stdlib) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index 92dffbff7c11..49e72a487633 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -3,14 +3,14 @@ (library (name tezos_stdlib_unix) - (public_name tezos-stdlib-unix) + (public_name octez-libs.tezos-stdlib-unix) (instrumentation (backend bisect_ppx)) (libraries unix - tezos-error-monad + octez-libs.tezos-error-monad tezos-lwt-result-stdlib - tezos-event-logging - tezos-stdlib + octez-libs.tezos-event-logging + octez-libs.tezos-stdlib data-encoding aches-lwt lwt.unix diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune index c9962d450507..b22b55113e3d 100644 --- a/src/lib_stdlib_unix/test/dune +++ b/src/lib_stdlib_unix/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-error-monad - tezos-stdlib-unix - tezos-event-logging + octez-libs.tezos-error-monad + octez-libs.tezos-stdlib-unix + octez-libs.tezos-event-logging tezos-test-helpers qcheck-alcotest octez-alcotezt) @@ -35,7 +35,7 @@ (rule (alias runtest) - (package tezos-stdlib-unix) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_store/dune b/src/lib_store/dune index 8669675d64aa..741611718ad7 100644 --- a/src/lib_store/dune +++ b/src/lib_store/dune @@ -6,11 +6,11 @@ (public_name tezos-store) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-crypto - tezos-rpc + octez-libs.tezos-base + octez-libs.tezos-crypto + octez-libs.tezos-rpc lwt-watcher - tezos-shell-services + octez-libs.tezos-shell-services tezos-validation tezos-context-ops tezos-store.shared) diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune index e082ec8c1adb..e17afa9acc3b 100644 --- a/src/lib_store/mocked/dune +++ b/src/lib_store/mocked/dune @@ -7,10 +7,10 @@ (implements tezos-store) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-crypto - tezos-shell-services - tezos-context.memory + octez-libs.tezos-base + octez-libs.tezos-crypto + octez-libs.tezos-shell-services + octez-libs.tezos-context.memory tezos-context-ops tezos-validation tezos-protocol-environment diff --git a/src/lib_store/shared/dune b/src/lib_store/shared/dune index 0570c1535345..b60a3584631e 100644 --- a/src/lib_store/shared/dune +++ b/src/lib_store/shared/dune @@ -6,10 +6,10 @@ (public_name tezos-store.shared) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib-unix - tezos-base - tezos-crypto - tezos-shell-services + octez-libs.tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-crypto + octez-libs.tezos-shell-services aches aches-lwt tezos-validation) diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune index 53d512b8aa31..0508d3128f34 100644 --- a/src/lib_store/unix/dune +++ b/src/lib_store/unix/dune @@ -6,21 +6,21 @@ (public_name tezos-store.unix) (instrumentation (backend bisect_ppx)) (libraries - tezos-shell-services - tezos-base - tezos-version + octez-libs.tezos-shell-services + octez-libs.tezos-base + octez-libs.tezos-version index irmin-pack tezos-store.shared tezos-protocol-environment - tezos-context + octez-libs.tezos-context tezos-context-ops tezos-shell-context tezos-validation tezos-protocol-updater - tezos-stdlib-unix - tezos-stdlib - tezos-crypto + octez-libs.tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-crypto lwt-watcher aches aches-lwt @@ -58,10 +58,10 @@ (public_name tezos-store.unix-reconstruction) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix - tezos-crypto - tezos-shell-services + 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 @@ -86,11 +86,11 @@ (public_name tezos-store.unix-snapshots) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix - tezos-crypto - tezos-shell-services - tezos-context + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-shell-services + octez-libs.tezos-context tezos-validation tezos-store.shared tezos-store.unix) diff --git a/src/lib_store/unix/test/bench/dune b/src/lib_store/unix/test/bench/dune index fe4fe776392c..bb0c34944336 100644 --- a/src/lib_store/unix/test/bench/dune +++ b/src/lib_store/unix/test/bench/dune @@ -5,7 +5,7 @@ (name bench) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezt octez-alcotezt src_lib_store_unix_test_tezt_lib) diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index b63f42b36301..645d1935a954 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-crypto + 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 - tezos-shell-services - tezos-stdlib-unix + octez-libs.tezos-shell-services + octez-libs.tezos-stdlib-unix tezos-validation tezos-protocol-updater tezos-embedded-protocol-demo-noops diff --git a/src/lib_store/unix/test/slow/dune b/src/lib_store/unix/test/slow/dune index 00a64ea6fa91..5dbeba350788 100644 --- a/src/lib_store/unix/test/slow/dune +++ b/src/lib_store/unix/test/slow/dune @@ -5,7 +5,7 @@ (name test_slow) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezt octez-alcotezt src_lib_store_unix_test_tezt_lib) diff --git a/src/lib_time_measurement/runtime/dune b/src/lib_time_measurement/runtime/dune index 3bb111a54ea6..02105e4a3f21 100644 --- a/src/lib_time_measurement/runtime/dune +++ b/src/lib_time_measurement/runtime/dune @@ -3,7 +3,7 @@ (public_name tezos-time-measurement) (libraries unix data-encoding - tezos-event-logging + octez-libs.tezos-event-logging lwt) (instrumentation.backend (ppx tezos-time-measurement.ppx)) (flags (:standard diff --git a/src/lib_tree_encoding/dune b/src/lib_tree_encoding/dune index ff7b171eb71a..0378e2499a31 100644 --- a/src/lib_tree_encoding/dune +++ b/src/lib_tree_encoding/dune @@ -3,11 +3,11 @@ (library (name tezos_tree_encoding) - (public_name tezos-tree-encoding) + (public_name octez-libs.tezos-tree-encoding) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-context.sigs + octez-libs.tezos-base + octez-libs.tezos-context.sigs tezos-lwt-result-stdlib data-encoding) (flags diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index 0dd01eea8d5b..b3f14da4c227 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-tree-encoding - tezos-base.unix - tezos-context.disk - tezos-base-test-helpers + octez-libs.tezos-base + octez-libs.tezos-tree-encoding + octez-libs.tezos-base.unix + octez-libs.tezos-context.disk + octez-libs.tezos-base-test-helpers tezos-test-helpers tezos-webassembly-interpreter qcheck-alcotest diff --git a/src/lib_validation/dune b/src/lib_validation/dune index 967dac641f1a..a72f7a34b2e8 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -7,15 +7,15 @@ (instrumentation (backend bisect_ppx)) (instrumentation (backend tezos-time-measurement)) (libraries - tezos-base - tezos-crypto - tezos-rpc - tezos-context + octez-libs.tezos-base + octez-libs.tezos-crypto + octez-libs.tezos-rpc + octez-libs.tezos-context tezos-context-ops tezos-shell-context - tezos-shell-services + octez-libs.tezos-shell-services tezos-protocol-updater - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-version.value) (flags (:standard) diff --git a/src/lib_version/dune b/src/lib_version/dune index 45ba048ca530..2149ba5e69d7 100644 --- a/src/lib_version/dune +++ b/src/lib_version/dune @@ -5,11 +5,11 @@ (library (name tezos_version) - (public_name tezos-version) + (public_name octez-libs.tezos-version) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-version.parser) + octez-libs.tezos-base + octez-libs.tezos-version.parser) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune index e335b81055e3..daa80e6bc32f 100644 --- a/src/lib_version/exe/dune +++ b/src/lib_version/exe/dune @@ -5,7 +5,7 @@ (name get_git_info) (libraries dune-configurator - tezos-version.parser) + octez-libs.tezos-version.parser) (modules get_git_info)) (executable @@ -14,8 +14,8 @@ (package tezos-version) (libraries tezos-version.value - tezos-version - tezos-base.unix) + octez-libs.tezos-version + octez-libs.tezos-base.unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp)) diff --git a/src/lib_version/parser/dune b/src/lib_version/parser/dune index 57501cfd3d1b..59bdfe72db2e 100644 --- a/src/lib_version/parser/dune +++ b/src/lib_version/parser/dune @@ -3,7 +3,7 @@ (library (name tezos_version_parser) - (public_name tezos-version.parser) + (public_name octez-libs.tezos-version.parser) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_deriving.show)) (js_of_ocaml)) diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune index 2185770405c2..1e23f9967a37 100644 --- a/src/lib_version/test/dune +++ b/src/lib_version/test/dune @@ -8,8 +8,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-version - tezos-version.parser + octez-libs.tezos-version + octez-libs.tezos-version.parser octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) @@ -32,7 +32,7 @@ (rule (alias runtest) - (package tezos-version) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -52,7 +52,7 @@ (rule (alias runtest_js) - (package tezos-version) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_version/value/dune b/src/lib_version/value/dune index 79715a17295c..3f2f3d385dff 100644 --- a/src/lib_version/value/dune +++ b/src/lib_version/value/dune @@ -8,9 +8,9 @@ (public_name tezos-version.value) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-version - tezos-version.parser) + octez-libs.tezos-base + octez-libs.tezos-version + octez-libs.tezos-version.parser) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_webassembly/bin/dune b/src/lib_webassembly/bin/dune index 17b9d4b5ff98..6da755df7dcc 100644 --- a/src/lib_webassembly/bin/dune +++ b/src/lib_webassembly/bin/dune @@ -8,8 +8,8 @@ tezos-webassembly-interpreter tezos-webassembly-interpreter-extra lwt.unix - tezos-tree-encoding - tezos-lazy-containers) + octez-libs.tezos-tree-encoding + octez-libs.tezos-lazy-containers) (flags (:standard) -open Tezos_webassembly_interpreter diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index bfc2e52b6195..cfa8f6c9a0aa 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-lwt-result-stdlib - tezos-stdlib - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad zarith - tezos-lazy-containers) + octez-libs.tezos-lazy-containers) (preprocess (pps ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_webassembly/extra/dune b/src/lib_webassembly/extra/dune index 019dc4e5e06d..2ff68d9228b3 100644 --- a/src/lib_webassembly/extra/dune +++ b/src/lib_webassembly/extra/dune @@ -8,7 +8,7 @@ (libraries tezos-webassembly-interpreter lwt.unix - tezos-lazy-containers) + octez-libs.tezos-lazy-containers) (flags (:standard) -open Tezos_webassembly_interpreter diff --git a/src/lib_workers/dune b/src/lib_workers/dune index 0460d5b0ee33..63d9bb26b2a7 100644 --- a/src/lib_workers/dune +++ b/src/lib_workers/dune @@ -3,15 +3,15 @@ (library (name tezos_workers) - (public_name tezos-workers) + (public_name octez-libs.tezos-workers) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix) + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix) (flags (:standard) -open Tezos_base.TzPervasives -open Tezos_base -open Tezos_stdlib_unix)) -(documentation (package tezos-workers) (mld_files tezos_workers)) +(documentation (package octez-libs) (mld_files tezos_workers)) diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune index 64584244fc38..e4979704b489 100644 --- a/src/lib_workers/test/dune +++ b/src/lib_workers/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-stdlib - tezos-stdlib-unix - tezos-base - tezos-workers + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-workers tezos-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -39,7 +39,7 @@ (rule (alias runtest) - (package tezos-workers) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index f7a88e51d569..0eaefa3925be 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -5,15 +5,15 @@ (name tezos_client_000_Ps9mPmXa) (public_name tezos-client-000-Ps9mPmXa) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-000-Ps9mPmXa tezos-protocol-000-Ps9mPmXa.lifted - tezos-rpc + octez-libs.tezos-rpc tezos-client-commands - tezos-stdlib-unix) + octez-libs.tezos-stdlib-unix) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index f175aa2f0679..de18443c5a9a 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_001_PtCJ7pwo) (public_name tezos-client-001-PtCJ7pwo) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-001-PtCJ7pwo tezos-protocol-001-PtCJ7pwo.lifted tezos-signer-backends - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index c5e503b5a458..b80d0e0803a4 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_001_PtCJ7pwo_commands) (public_name tezos-client-001-PtCJ7pwo.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-001-PtCJ7pwo - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-001-PtCJ7pwo tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_001_PtCJ7pwo_commands_registration) (public_name tezos-client-001-PtCJ7pwo.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-001-PtCJ7pwo tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-001-PtCJ7pwo tezos-client-commands tezos-client-001-PtCJ7pwo.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index b77e7f5719e6..4456c96d9ccd 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_002_PsYLVpVv) (public_name tezos-client-002-PsYLVpVv) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-002-PsYLVpVv tezos-protocol-002-PsYLVpVv.lifted tezos-signer-backends - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index c6bce43f2eb0..4aa380eb9684 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_002_PsYLVpVv_commands) (public_name tezos-client-002-PsYLVpVv.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-002-PsYLVpVv - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-002-PsYLVpVv tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_002_PsYLVpVv_commands_registration) (public_name tezos-client-002-PsYLVpVv.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-002-PsYLVpVv tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-002-PsYLVpVv tezos-client-commands tezos-client-002-PsYLVpVv.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index f51109d59f70..847f1607a101 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_003_PsddFKi3) (public_name tezos-client-003-PsddFKi3) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-003-PsddFKi3 tezos-protocol-003-PsddFKi3.lifted tezos-signer-backends - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index c5e72efea43b..bd160af44ab8 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_003_PsddFKi3_commands) (public_name tezos-client-003-PsddFKi3.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-003-PsddFKi3 - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-003-PsddFKi3 tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_003_PsddFKi3_commands_registration) (public_name tezos-client-003-PsddFKi3.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-003-PsddFKi3 tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-003-PsddFKi3 tezos-client-commands tezos-client-003-PsddFKi3.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index 8b3172f3ee48..3c0fc8ab8b63 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_004_Pt24m4xi) (public_name tezos-client-004-Pt24m4xi) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-004-Pt24m4xi tezos-protocol-004-Pt24m4xi.lifted tezos-signer-backends - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index 323650af951d..d66eb36d19c0 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_004_Pt24m4xi_commands) (public_name tezos-client-004-Pt24m4xi.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-004-Pt24m4xi - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-004-Pt24m4xi tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_004_Pt24m4xi_commands_registration) (public_name tezos-client-004-Pt24m4xi.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-004-Pt24m4xi tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-004-Pt24m4xi tezos-client-commands tezos-client-004-Pt24m4xi.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 54c2b659d9c9..dc85b9016517 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_005_PsBabyM1) (public_name tezos-client-005-PsBabyM1) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-005-PsBabyM1 tezos-protocol-005-PsBabyM1.lifted tezos-signer-backends - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index 80607abd09d5..6116ec928a9c 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_005_PsBabyM1_commands) (public_name tezos-client-005-PsBabyM1.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-005-PsBabyM1 - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-005-PsBabyM1 tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_005_PsBabyM1_commands_registration) (public_name tezos-client-005-PsBabyM1.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-005-PsBabyM1 tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-005-PsBabyM1 tezos-client-commands tezos-client-005-PsBabyM1.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index e255147abc1e..c4946a845bd4 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_006_PsCARTHA) (public_name tezos-client-006-PsCARTHA) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-006-PsCARTHA tezos-protocol-006-PsCARTHA.lifted tezos-signer-backends - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index 06587d87daec..1d429de141c6 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_006_PsCARTHA_commands) (public_name tezos-client-006-PsCARTHA.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-006-PsCARTHA - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-006-PsCARTHA tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_006_PsCARTHA_commands_registration) (public_name tezos-client-006-PsCARTHA.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-006-PsCARTHA tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-006-PsCARTHA tezos-client-commands tezos-client-006-PsCARTHA.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 616abd1d9422..7321e0ace500 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -5,15 +5,15 @@ (name tezos_client_007_PsDELPH1) (public_name tezos-client-007-PsDELPH1) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-007-PsDELPH1 tezos-protocol-007-PsDELPH1.lifted tezos-signer-backends tezos-protocol-plugin-007-PsDELPH1 - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index d8282a3a726b..fbd7c960f579 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_007_PsDELPH1_commands) (public_name tezos-client-007-PsDELPH1.commands) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-007-PsDELPH1 - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-007-PsDELPH1 tezos-client-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,16 +32,16 @@ (name tezos_client_007_PsDELPH1_commands_registration) (public_name tezos-client-007-PsDELPH1.commands-registration) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-007-PsDELPH1 tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-007-PsDELPH1 tezos-client-commands tezos-client-007-PsDELPH1.commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune index 72b937ff6e69..477234d34909 100644 --- a/src/proto_007_PsDELPH1/lib_plugin/dune +++ b/src/proto_007_PsDELPH1/lib_plugin/dune @@ -5,7 +5,7 @@ (name tezos_protocol_plugin_007_PsDELPH1) (public_name tezos-protocol-plugin-007-PsDELPH1) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-007-PsDELPH1) (flags (:standard) @@ -18,7 +18,7 @@ (name tezos_protocol_plugin_007_PsDELPH1_registerer) (public_name tezos-protocol-plugin-007-PsDELPH1-registerer) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-007-PsDELPH1 tezos-protocol-plugin-007-PsDELPH1 tezos-validation) diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index 516d0772f213..5c0611a38471 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -6,15 +6,15 @@ (public_name tezos-client-008-PtEdo2Zk) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-008-PtEdo2Zk tezos-protocol-008-PtEdo2Zk.lifted tezos-signer-backends tezos-protocol-plugin-008-PtEdo2Zk - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 51b851bd4eea..51db04c1b229 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -6,16 +6,16 @@ (public_name tezos-client-008-PtEdo2Zk.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-008-PtEdo2Zk - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-008-PtEdo2Zk tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-008-PtEdo2Zk) (library_flags (:standard -linkall)) (flags @@ -36,16 +36,16 @@ (public_name tezos-client-008-PtEdo2Zk.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-008-PtEdo2Zk tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-008-PtEdo2Zk tezos-client-commands tezos-client-008-PtEdo2Zk.commands - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-008-PtEdo2Zk) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune index fe0905f1f400..f32a14543b8f 100644 --- a/src/proto_008_PtEdo2Zk/lib_plugin/dune +++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-008-PtEdo2Zk) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-008-PtEdo2Zk) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-008-PtEdo2Zk-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-008-PtEdo2Zk tezos-protocol-plugin-008-PtEdo2Zk tezos-validation) diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index f2d0752430fb..e9f05d526c8a 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -6,15 +6,15 @@ (public_name tezos-client-009-PsFLoren) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-009-PsFLoren tezos-protocol-009-PsFLoren.lifted tezos-signer-backends tezos-protocol-plugin-009-PsFLoren - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index 3822c9326890..b77cfbf43fa9 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -6,16 +6,16 @@ (public_name tezos-client-009-PsFLoren.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-009-PsFLoren - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-009-PsFLoren tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-009-PsFLoren) (library_flags (:standard -linkall)) @@ -38,16 +38,16 @@ (public_name tezos-client-009-PsFLoren.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-009-PsFLoren tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-009-PsFLoren tezos-client-commands tezos-client-009-PsFLoren.commands - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-009-PsFLoren) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune index 88c97a269bbd..373a752853e0 100644 --- a/src/proto_009_PsFLoren/lib_plugin/dune +++ b/src/proto_009_PsFLoren/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-009-PsFLoren) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-009-PsFLoren) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-009-PsFLoren-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-009-PsFLoren tezos-protocol-plugin-009-PsFLoren tezos-validation) diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 0744348c49df..ee9b7a29f1a7 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -6,15 +6,15 @@ (public_name tezos-client-010-PtGRANAD) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-010-PtGRANAD tezos-protocol-010-PtGRANAD.lifted tezos-signer-backends tezos-protocol-plugin-010-PtGRANAD - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index dd408377bb30..0bb9e796ccad 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -6,16 +6,16 @@ (public_name tezos-client-010-PtGRANAD.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-010-PtGRANAD - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-010-PtGRANAD tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-010-PtGRANAD) (library_flags (:standard -linkall)) @@ -38,16 +38,16 @@ (public_name tezos-client-010-PtGRANAD.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-010-PtGRANAD tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-010-PtGRANAD tezos-client-commands tezos-client-010-PtGRANAD.commands - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-010-PtGRANAD) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune index 0c21a73736e0..c8e0e4642a73 100644 --- a/src/proto_010_PtGRANAD/lib_plugin/dune +++ b/src/proto_010_PtGRANAD/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-010-PtGRANAD) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-010-PtGRANAD) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-010-PtGRANAD-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-010-PtGRANAD tezos-protocol-plugin-010-PtGRANAD tezos-validation) diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index df0bca428fd2..0084cbc3cccf 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-011-PtHangz2) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-011-PtHangz2 tezos-protocol-011-PtHangz2.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-011-PtHangz2 tezos-protocol-011-PtHangz2.parameters - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index 160535731b82..29cc24a797ee 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -6,19 +6,19 @@ (public_name tezos-client-011-PtHangz2.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-011-PtHangz2 - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-011-PtHangz2 tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-011-PtHangz2 uri) @@ -42,17 +42,17 @@ (public_name tezos-client-011-PtHangz2.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-011-PtHangz2 tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-011-PtHangz2 tezos-client-commands tezos-client-011-PtHangz2.commands tezos-client-011-PtHangz2.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-011-PtHangz2) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index 41080cab58b6..df12d4bf49bd 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-011-PtHangz2.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-011-PtHangz2 diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index 1fd3d4da27ec..b133366e5a98 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-011-PtHangz2.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-011-PtHangz2) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-011-PtHangz2.parameters) (link_flags (:standard) diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune index be7b09966465..8de656990851 100644 --- a/src/proto_011_PtHangz2/lib_plugin/dune +++ b/src/proto_011_PtHangz2/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-011-PtHangz2) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-011-PtHangz2) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-011-PtHangz2-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-011-PtHangz2 tezos-protocol-plugin-011-PtHangz2 tezos-validation) diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index a43404fbe692..04f34d78821b 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-012-Psithaca) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-012-Psithaca tezos-protocol-012-Psithaca.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-012-Psithaca tezos-protocol-012-Psithaca.parameters - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index 6164f9cee6f1..331e82bbec03 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -6,19 +6,19 @@ (public_name tezos-client-012-Psithaca.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-012-Psithaca - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-012-Psithaca tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-012-Psithaca uri) @@ -42,17 +42,17 @@ (public_name tezos-client-012-Psithaca.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-012-Psithaca tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-012-Psithaca tezos-client-commands tezos-client-012-Psithaca.commands tezos-client-012-Psithaca.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-012-Psithaca) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index 14334abe3f7a..be0edb69edc6 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-012-Psithaca.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-012-Psithaca diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index ed7923c17602..10959854f7ec 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-012-Psithaca.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-012-Psithaca) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-012-Psithaca.parameters tezos-protocol-012-Psithaca) (link_flags diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune index 4e11c0bb3143..7b73afdc894a 100644 --- a/src/proto_012_Psithaca/lib_plugin/dune +++ b/src/proto_012_Psithaca/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-012-Psithaca) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-012-Psithaca) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-012-Psithaca-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-012-Psithaca tezos-protocol-plugin-012-Psithaca tezos-validation) diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 375844bcb6d0..42100b03fb73 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-013-PtJakart) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-013-PtJakart tezos-protocol-013-PtJakart.parameters - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 3193c9118ea6..0f948dd83a1a 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-013-PtJakart.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-013-PtJakart tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-013-PtJakart uri) @@ -44,18 +44,18 @@ (public_name tezos-client-013-PtJakart.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-013-PtJakart tezos-client-commands tezos-client-013-PtJakart.commands tezos-client-013-PtJakart.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-013-PtJakart) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index 58c024b747ec..59582996f106 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-013-PtJakart.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 77bab634c5f8..46d9704b18d0 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-013-PtJakart.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-013-PtJakart) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-013-PtJakart.parameters tezos-protocol-013-PtJakart) (link_flags diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune index 0a306d120946..551c150ebd63 100644 --- a/src/proto_013_PtJakart/lib_plugin/dune +++ b/src/proto_013_PtJakart/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-013-PtJakart) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-013-PtJakart) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-013-PtJakart-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart tezos-validation) diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index f0258790f2d8..c387fa10988c 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-014-PtKathma) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-014-PtKathma tezos-protocol-014-PtKathma.parameters - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index f6187a3ca60d..14e362694cc2 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-014-PtKathma.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-014-PtKathma tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-014-PtKathma uri) @@ -44,18 +44,18 @@ (public_name tezos-client-014-PtKathma.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-014-PtKathma tezos-client-commands tezos-client-014-PtKathma.commands tezos-client-014-PtKathma.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-014-PtKathma) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index 568a93dd1bf8..ada9bf0e1bf8 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-014-PtKathma.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-014-PtKathma diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index d57c5b30672c..ff9dcdeb8883 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-014-PtKathma.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-014-PtKathma) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-014-PtKathma.parameters tezos-protocol-014-PtKathma) (link_flags diff --git a/src/proto_014_PtKathma/lib_plugin/dune b/src/proto_014_PtKathma/lib_plugin/dune index ff1a881658a4..62ff69e491ad 100644 --- a/src/proto_014_PtKathma/lib_plugin/dune +++ b/src/proto_014_PtKathma/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-014-PtKathma) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-014-PtKathma) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-014-PtKathma-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-014-PtKathma tezos-protocol-plugin-014-PtKathma tezos-validation) diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index 5df6fcd3725c..2f34e64828d0 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-015-PtLimaPt) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters - tezos-rpc + octez-libs.tezos-rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune index 1c39644380ad..c9cca52a8eae 100644 --- a/src/proto_015_PtLimaPt/lib_client_commands/dune +++ b/src/proto_015_PtLimaPt/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-015-PtLimaPt.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-015-PtLimaPt tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-015-PtLimaPt uri) @@ -43,18 +43,18 @@ (public_name tezos-client-015-PtLimaPt.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-015-PtLimaPt tezos-client-commands tezos-client-015-PtLimaPt.commands tezos-client-015-PtLimaPt.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-015-PtLimaPt) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune index 8193d572162b..82991c64c24c 100644 --- a/src/proto_015_PtLimaPt/lib_client_sapling/dune +++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-015-PtLimaPt.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-015-PtLimaPt diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index 224629b25fdd..41148d5ff497 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-015-PtLimaPt.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-015-PtLimaPt) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-015-PtLimaPt.parameters tezos-protocol-015-PtLimaPt) (link_flags diff --git a/src/proto_015_PtLimaPt/lib_plugin/dune b/src/proto_015_PtLimaPt/lib_plugin/dune index baa723a3b681..b0b9b2e47e21 100644 --- a/src/proto_015_PtLimaPt/lib_plugin/dune +++ b/src/proto_015_PtLimaPt/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-015-PtLimaPt) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-015-PtLimaPt) (flags (:standard) @@ -20,7 +20,7 @@ (public_name tezos-protocol-plugin-015-PtLimaPt-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-015-PtLimaPt tezos-protocol-plugin-015-PtLimaPt tezos-validation) diff --git a/src/proto_016_PtMumbai/bin_accuser/dune b/src/proto_016_PtMumbai/bin_accuser/dune index 18dc48523bc0..cbb9e92b061b 100644 --- a/src/proto_016_PtMumbai/bin_accuser/dune +++ b/src/proto_016_PtMumbai/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-client-commands tezos-baking-016-PtMumbai-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_016_PtMumbai/bin_baker/dune b/src/proto_016_PtMumbai/bin_baker/dune index e23bfec1f9dc..32882cd23f91 100644 --- a/src/proto_016_PtMumbai/bin_baker/dune +++ b/src/proto_016_PtMumbai/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-client-commands tezos-baking-016-PtMumbai-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune index 489cb2b99a19..bbd6a31d683e 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune +++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune @@ -7,7 +7,7 @@ (package octez-smart-rollup-client-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-016-PtMumbai octez_smart_rollup_client_PtMumbai diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune index 628052615626..6c59aa9869f4 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune @@ -7,10 +7,10 @@ (package octez-smart-rollup-node-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-016-PtMumbai - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/proto_016_PtMumbai/lib_benchmark/dune b/src/proto_016_PtMumbai/lib_benchmark/dune index a61edd295222..10951242637e 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/dune +++ b/src/proto_016_PtMumbai/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_016_PtMumbai) (public_name tezos-benchmark-016-PtMumbai) (libraries - tezos-stdlib - tezos-base - tezos-error-monad - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-crypto + octez-libs.tezos-crypto tezos-protocol-016-PtMumbai.parameters hashcons tezos-016-PtMumbai-test-helpers diff --git a/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/dune index 907af7e2d754..b012010ad9d7 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-error-monad - tezos-crypto - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad + octez-libs.tezos-crypto + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-016-PtMumbai hashcons) diff --git a/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune index 402aaff06059..6e362fa57036 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - tezos-micheline + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark-type-inference-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-error-monad + octez-libs.tezos-error-monad tezos-client-016-PtMumbai) (link_flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_benchmark/test/dune b/src/proto_016_PtMumbai/lib_benchmark/test/dune index 2bd70d7de9e1..3881acc689d1 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/test/dune +++ b/src/proto_016_PtMumbai/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-016-PtMumbai tezos-benchmark tezos-benchmark-type-inference-016-PtMumbai tezos-benchmark-016-PtMumbai tezos-016-PtMumbai-test-helpers - tezos-error-monad + octez-libs.tezos-error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_benchmarks_proto/dune b/src/proto_016_PtMumbai/lib_benchmarks_proto/dune index e66fde315d24..3bdc22fe58b9 100644 --- a/src/proto_016_PtMumbai/lib_benchmarks_proto/dune +++ b/src/proto_016_PtMumbai/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - tezos-stdlib - tezos-base - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad tezos-protocol-016-PtMumbai.parameters - tezos-lazy-containers + octez-libs.tezos-lazy-containers tezos-benchmark tezos-benchmark-016-PtMumbai tezos-benchmark-type-inference-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-crypto + octez-libs.tezos-crypto tezos-shell-benchmarks - tezos-micheline + octez-libs.tezos-micheline tezos-016-PtMumbai-test-helpers tezos-sapling tezos-client-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index a2195469cdfb..9ff53959533e 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - tezos-rpc + octez-libs.tezos-rpc tezos-smart-rollup-016-PtMumbai uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_016_PtMumbai/lib_client/test/dune b/src/proto_016_PtMumbai/lib_client/test/dune index da1578e9a460..57996a17fbfc 100644 --- a/src/proto_016_PtMumbai/lib_client/test/dune +++ b/src/proto_016_PtMumbai/lib_client/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-test-helpers octez-alcotezt qcheck-alcotest) diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune index d096ec41db77..e241fdcd51c6 100644 --- a/src/proto_016_PtMumbai/lib_client_commands/dune +++ b/src/proto_016_PtMumbai/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-016-PtMumbai.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-016-PtMumbai tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-016-PtMumbai uri) @@ -43,18 +43,18 @@ (public_name tezos-client-016-PtMumbai.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-016-PtMumbai tezos-client-commands tezos-client-016-PtMumbai.commands tezos-client-016-PtMumbai.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-016-PtMumbai) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune index 3321c31a83a0..51fc27fdc746 100644 --- a/src/proto_016_PtMumbai/lib_client_sapling/dune +++ b/src/proto_016_PtMumbai/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-016-PtMumbai.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_dal/dune b/src/proto_016_PtMumbai/lib_dal/dune index d036f32d4908..28ecf44f8e0d 100644 --- a/src/proto_016_PtMumbai/lib_dal/dune +++ b/src/proto_016_PtMumbai/lib_dal/dune @@ -6,9 +6,9 @@ (public_name tezos-dal-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dal-node-lib tezos-client-016-PtMumbai tezos-protocol-plugin-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_dal/test/dune b/src/proto_016_PtMumbai/lib_dal/test/dune index 04fbc73bef7a..1b8fb21ec0f1 100644 --- a/src/proto_016_PtMumbai/lib_dal/test/dune +++ b/src/proto_016_PtMumbai/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dal-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-016-PtMumbai-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_016_PtMumbai/lib_delegate/dune b/src/proto_016_PtMumbai/lib_delegate/dune index 73814284bd57..8fa2b01714b7 100644 --- a/src/proto_016_PtMumbai/lib_delegate/dune +++ b/src/proto_016_PtMumbai/lib_delegate/dune @@ -6,25 +6,25 @@ (public_name tezos-baking-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-version.value tezos-protocol-016-PtMumbai tezos-protocol-plugin-016-PtMumbai tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-016-PtMumbai tezos-client-commands - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix tezos-shell-context - tezos-context - tezos-context.memory - tezos-rpc-http-client-unix + octez-libs.tezos-context + octez-libs.tezos-context.memory + octez-libs.tezos-rpc-http-client-unix tezos-context-ops - tezos-rpc - tezos-rpc-http + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http lwt-canceler lwt-exit uri) @@ -52,16 +52,16 @@ (public_name tezos-baking-016-PtMumbai-commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-016-PtMumbai tezos-client-commands tezos-baking-016-PtMumbai - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags @@ -82,16 +82,16 @@ (public_name tezos-baking-016-PtMumbai-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-016-PtMumbai tezos-client-commands tezos-baking-016-PtMumbai tezos-baking-016-PtMumbai-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_delegate/test/dune b/src/proto_016_PtMumbai/lib_delegate/test/dune index 4e586a4f4f7f..13dce4c58482 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-baking-016-PtMumbai.mockup-simulator tezos-baking-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - tezos-crypto + octez-libs.tezos-crypto octez-alcotezt uri) (library_flags (:standard -linkall)) diff --git a/src/proto_016_PtMumbai/lib_delegate/test/mockup_simulator/dune b/src/proto_016_PtMumbai/lib_delegate/test/mockup_simulator/dune index dca22937564d..ea038abca3bd 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_016_PtMumbai_mockup_simulator) (public_name tezos-baking-016-PtMumbai.mockup-simulator) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-client-commands tezos-baking-016-PtMumbai - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix tezos-protocol-016-PtMumbai.parameters tezos-mockup diff --git a/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune b/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune index b00c442c989e..756faf95d28b 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base tezos-client-016-PtMumbai tezos-protocol-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/lib/dune b/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/lib/dune index a1e0e3c5be3b..30bf7359ebe3 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name tezos-baking-016-PtMumbai.tenderbrute) (libraries data-encoding - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-protocol-016-PtMumbai tezos-client-base tezos-client-016-PtMumbai) diff --git a/src/proto_016_PtMumbai/lib_layer2_utils/dune b/src/proto_016_PtMumbai/lib_layer2_utils/dune index 6a91309350ac..c42bd05364be 100644 --- a/src/proto_016_PtMumbai/lib_layer2_utils/dune +++ b/src/proto_016_PtMumbai/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name tezos-layer2-utils-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index c8eac8eba2af..521b04ff896e 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-016-PtMumbai.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-016-PtMumbai) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai.parameters tezos-protocol-016-PtMumbai) (link_flags diff --git a/src/proto_016_PtMumbai/lib_plugin/dune b/src/proto_016_PtMumbai/lib_plugin/dune index 7021bb912e50..dfa6e7a37a08 100644 --- a/src/proto_016_PtMumbai/lib_plugin/dune +++ b/src/proto_016_PtMumbai/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-smart-rollup-016-PtMumbai) (flags @@ -22,7 +22,7 @@ (public_name tezos-protocol-plugin-016-PtMumbai-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-016-PtMumbai tezos-protocol-plugin-016-PtMumbai tezos-validation) diff --git a/src/proto_016_PtMumbai/lib_plugin/test/dune b/src/proto_016_PtMumbai/lib_plugin/test/dune index 0c64ee5bf7a1..defe161c6370 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/dune +++ b/src/proto_016_PtMumbai/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-base.unix octez-alcotezt tezos-test-helpers qcheck-alcotest - tezos-stdlib-unix - tezos-micheline + octez-libs.tezos-stdlib-unix + octez-libs.tezos-micheline tezos-protocol-plugin-016-PtMumbai tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters diff --git a/src/proto_016_PtMumbai/lib_protocol/test/helpers/dune b/src/proto_016_PtMumbai/lib_protocol/test/helpers/dune index 95c3749b0b76..03b2f8bea063 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/helpers/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/helpers/dune @@ -8,17 +8,17 @@ (libraries qcheck-alcotest tezos-test-helpers - tezos-base - tezos-micheline - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-micheline + octez-libs.tezos-stdlib-unix tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-protocol-016-PtMumbai.parameters tezos-protocol-environment tezos-protocol-plugin-016-PtMumbai - tezos-shell-services + octez-libs.tezos-shell-services octez-plompiler - tezos-crypto-dal) + octez-libs.tezos-crypto-dal) (flags (:standard) -open Tezos_test_helpers diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune index 624622ff4987..18e4783552ba 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune @@ -8,10 +8,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-016-PtMumbai-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-016-PtMumbai.parameters tezos-protocol-plugin-016-PtMumbai) (library_flags (:standard -linkall)) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/dune index edec5df63cd7..ba72f656f2fa 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/dune @@ -7,14 +7,14 @@ (libraries tezt.core tezt - tezos-context + octez-libs.tezos-context octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-client-016-PtMumbai tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters tezos-016-PtMumbai-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune index 339899a8aa6e..51620a4e3967 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-016-PtMumbai-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune index a86fb297c34e..f76e7a3861b2 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune @@ -8,13 +8,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-016-PtMumbai-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-client-016-PtMumbai tezos-benchmark - tezos-micheline + octez-libs.tezos-micheline tezos-benchmark-016-PtMumbai tezos-benchmark-type-inference-016-PtMumbai tezos-protocol-plugin-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune index 197400d5fc73..4850bf221353 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune @@ -8,11 +8,11 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-016-PtMumbai-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-016-PtMumbai) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune index 8a40ed68eabf..deb30ce96294 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai qcheck-alcotest tezos-client-016-PtMumbai tezos-test-helpers tezos-016-PtMumbai-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-016-PtMumbai) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune index 7561df4c3718..f721a0ff1018 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-016-PtMumbai tezos-protocol-016-PtMumbai - tezos-context.merkle_proof_encoding + octez-libs.tezos-context.merkle_proof_encoding tezos-test-helpers tezos-016-PtMumbai-test-helpers octez-alcotezt @@ -19,8 +19,8 @@ tezos-benchmark-016-PtMumbai tezos-benchmark-type-inference-016-PtMumbai tezos-smart-rollup-016-PtMumbai - tezos-crypto-dal - tezos-base-test-helpers + octez-libs.tezos-crypto-dal + octez-libs.tezos-base-test-helpers tezos-protocol-016-PtMumbai.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_protocol/test/regression/dune b/src/proto_016_PtMumbai/lib_protocol/test/regression/dune index 837d431da709..11fb82756f1b 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/regression/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezt-tezos + octez-libs.tezos-base + octez-libs.tezt-tezos tezos-protocol-016-PtMumbai tezos-client-016-PtMumbai tezos-protocol-plugin-016-PtMumbai tezos-016-PtMumbai-test-helpers - tezos-micheline) + octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/unit/dune b/src/proto_016_PtMumbai/lib_protocol/test/unit/dune index f9e9b57cf855..e013e4dfe10c 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/unit/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-micheline tezos-client-016-PtMumbai tezos-client-base tezos-protocol-016-PtMumbai.parameters tezos-protocol-environment - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-016-PtMumbai tezos-test-helpers tezos-016-PtMumbai-test-helpers octez-alcotezt tezos-scoru-wasm-helpers - tezos-stdlib - tezos-crypto-dal + octez-libs.tezos-stdlib + octez-libs.tezos-crypto-dal tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/dune b/src/proto_016_PtMumbai/lib_sc_rollup/dune index 4de3285663a9..84ed4fdac3af 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_client/dune b/src/proto_016_PtMumbai/lib_sc_rollup_client/dune index 485ee6013c07..99db0e90fd34 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_client/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-client-commands tezos-client-base diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune index 0906fc85709a..320d927f5ffb 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-layer2-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai octez-injector octez-smart-rollup) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/dune b/src/proto_016_PtMumbai/lib_sc_rollup_node/dune index d212f728e646..c1d5ff001b10 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/dune @@ -6,31 +6,31 @@ (package octez-smart-rollup-node-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix tezos-client-base tezos-client-base-unix tezos-client-016-PtMumbai - tezos-context.encoding - tezos-context.helpers + octez-libs.tezos-context.encoding + octez-libs.tezos-context.helpers tezos-protocol-016-PtMumbai tezos-protocol-plugin-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - tezos-rpc - tezos-rpc-http - tezos-rpc-http-server - tezos-workers + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server + octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib tezos-dac-lib - tezos-shell-services + octez-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-016-PtMumbai tezos-smart-rollup-layer2-016-PtMumbai tezos-layer2-utils-016-PtMumbai tezos_layer2_store octez-crawler - tezos-tree-encoding + octez-libs.tezos-tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -41,7 +41,7 @@ octez-smart-rollup-node-lib tezos-scoru-wasm tezos-scoru-wasm-fast - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune b/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune index 529e87727452..00424efbd2a9 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-test-helpers tezos-smart-rollup-layer2-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/test/helpers/dune b/src/proto_016_PtMumbai/lib_sc_rollup_node/test/helpers/dune index 66a1eb2e0087..d1a06f3346cf 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/test/helpers/dune @@ -6,7 +6,7 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters tezos-client-016-PtMumbai diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune index 17e8ea78613c..441613ee6c7a 100644 --- a/src/proto_017_PtNairob/bin_accuser/dune +++ b/src/proto_017_PtNairob/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-client-commands tezos-baking-017-PtNairob-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune index f325447be1a4..5bb617527a11 100644 --- a/src/proto_017_PtNairob/bin_baker/dune +++ b/src/proto_017_PtNairob/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-client-commands tezos-baking-017-PtNairob-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/bin_sc_rollup_client/dune b/src/proto_017_PtNairob/bin_sc_rollup_client/dune index 16c2fc41dfbf..c5588a6d3ee5 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_client/dune @@ -7,7 +7,7 @@ (package octez-smart-rollup-client-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-017-PtNairob octez_smart_rollup_client_PtNairob diff --git a/src/proto_017_PtNairob/bin_sc_rollup_node/dune b/src/proto_017_PtNairob/bin_sc_rollup_node/dune index 5df876d3682a..fb02b5d086ec 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune @@ -7,10 +7,10 @@ (package octez-smart-rollup-node-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-017-PtNairob - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/proto_017_PtNairob/lib_benchmark/dune b/src/proto_017_PtNairob/lib_benchmark/dune index 34d5c1b7a4ef..a5e1af9187c9 100644 --- a/src/proto_017_PtNairob/lib_benchmark/dune +++ b/src/proto_017_PtNairob/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_017_PtNairob) (public_name tezos-benchmark-017-PtNairob) (libraries - tezos-stdlib - tezos-base - tezos-error-monad - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob - tezos-crypto + octez-libs.tezos-crypto tezos-protocol-017-PtNairob.parameters hashcons tezos-017-PtNairob-test-helpers diff --git a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune index 90727e0d8683..9f0a55030dc9 100644 --- a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-error-monad - tezos-crypto - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad + octez-libs.tezos-crypto + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-017-PtNairob hashcons) diff --git a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune index d860d41b0a6f..d74f0a89d2fe 100644 --- a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - tezos-micheline + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob - tezos-error-monad + octez-libs.tezos-error-monad tezos-client-017-PtNairob) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/lib_benchmark/test/dune b/src/proto_017_PtNairob/lib_benchmark/test/dune index 5f0e996f0de9..1da6a85b43c4 100644 --- a/src/proto_017_PtNairob/lib_benchmark/test/dune +++ b/src/proto_017_PtNairob/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-017-PtNairob tezos-benchmark tezos-benchmark-type-inference-017-PtNairob tezos-benchmark-017-PtNairob tezos-017-PtNairob-test-helpers - tezos-error-monad + octez-libs.tezos-error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune index d232c8d18b3a..67fd0b8de2b3 100644 --- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune +++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - tezos-stdlib - tezos-base - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad tezos-protocol-017-PtNairob.parameters - tezos-lazy-containers + octez-libs.tezos-lazy-containers tezos-benchmark tezos-benchmark-017-PtNairob tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob - tezos-crypto + octez-libs.tezos-crypto tezos-shell-benchmarks - tezos-micheline + octez-libs.tezos-micheline tezos-017-PtNairob-test-helpers tezos-sapling tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index b21f2e63b077..d3881234189a 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-017-PtNairob tezos-protocol-017-PtNairob.parameters - tezos-rpc + octez-libs.tezos-rpc tezos-smart-rollup-017-PtNairob uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_017_PtNairob/lib_client/test/dune b/src/proto_017_PtNairob/lib_client/test/dune index efa3f000762d..53b7c4bbe104 100644 --- a/src/proto_017_PtNairob/lib_client/test/dune +++ b/src/proto_017_PtNairob/lib_client/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-017-PtNairob tezos-protocol-017-PtNairob - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-test-helpers octez-alcotezt qcheck-alcotest) diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune index 591f4bb9bfe8..0a91c6cd4796 100644 --- a/src/proto_017_PtNairob/lib_client_commands/dune +++ b/src/proto_017_PtNairob/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-017-PtNairob.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-017-PtNairob tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-017-PtNairob uri) @@ -43,18 +43,18 @@ (public_name tezos-client-017-PtNairob.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob tezos-client-commands tezos-client-017-PtNairob.commands tezos-client-017-PtNairob.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-017-PtNairob) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune index 767e9ad47bc4..c48773c5a049 100644 --- a/src/proto_017_PtNairob/lib_client_sapling/dune +++ b/src/proto_017_PtNairob/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-017-PtNairob.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_dac_plugin/dune b/src/proto_017_PtNairob/lib_dac_plugin/dune index cacbdbd772a0..ba5652cf46ea 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/dune +++ b/src/proto_017_PtNairob/lib_dac_plugin/dune @@ -6,9 +6,9 @@ (public_name tezos-dac-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dac-lib tezos-dac-client-lib tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/dune b/src/proto_017_PtNairob/lib_dac_plugin/test/dune index 5e2225979b01..99ac737fa20c 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_dac_plugin/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dac-017-PtNairob tezos-protocol-017-PtNairob - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-017-PtNairob-test-helpers tezos-dac-lib tezos_dac_node_lib diff --git a/src/proto_017_PtNairob/lib_dal/dune b/src/proto_017_PtNairob/lib_dal/dune index 139be6b40470..c9f0144bc64e 100644 --- a/src/proto_017_PtNairob/lib_dal/dune +++ b/src/proto_017_PtNairob/lib_dal/dune @@ -6,9 +6,9 @@ (public_name tezos-dal-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dal-node-lib tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_dal/test/dune b/src/proto_017_PtNairob/lib_dal/test/dune index 804512704ae3..44d3750f814c 100644 --- a/src/proto_017_PtNairob/lib_dal/test/dune +++ b/src/proto_017_PtNairob/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dal-017-PtNairob tezos-protocol-017-PtNairob - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index a1b01f0aab2d..d12dce570ca0 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -6,25 +6,25 @@ (public_name tezos-baking-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-version.value tezos-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob tezos-client-commands - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix tezos-shell-context - tezos-context - tezos-context.memory - tezos-rpc-http-client-unix + octez-libs.tezos-context + octez-libs.tezos-context.memory + octez-libs.tezos-rpc-http-client-unix tezos-context-ops - tezos-rpc - tezos-rpc-http + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http tezos-dal-node-services lwt-canceler lwt-exit @@ -53,16 +53,16 @@ (public_name tezos-baking-017-PtNairob-commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob tezos-client-commands tezos-baking-017-PtNairob - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags @@ -83,16 +83,16 @@ (public_name tezos-baking-017-PtNairob-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob tezos-client-commands tezos-baking-017-PtNairob tezos-baking-017-PtNairob-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_delegate/test/dune b/src/proto_017_PtNairob/lib_delegate/test/dune index 15f28f6fa37a..9dc9f52ba254 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-017-PtNairob tezos-protocol-017-PtNairob - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-baking-017-PtNairob.mockup-simulator tezos-baking-017-PtNairob tezos-protocol-017-PtNairob.parameters - tezos-crypto + octez-libs.tezos-crypto octez-alcotezt uri) (library_flags (:standard -linkall)) 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 2f4826b5b889..e2dba049aa2c 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_017_PtNairob_mockup_simulator) (public_name tezos-baking-017-PtNairob.mockup-simulator) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-client-commands tezos-baking-017-PtNairob - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix tezos-protocol-017-PtNairob.parameters tezos-mockup diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune index 723669b02677..46d46e8f3c94 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base tezos-client-017-PtNairob tezos-protocol-017-PtNairob 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 b981e599fc0c..63083e2769f2 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name tezos-baking-017-PtNairob.tenderbrute) (libraries data-encoding - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-protocol-017-PtNairob tezos-client-base tezos-client-017-PtNairob) diff --git a/src/proto_017_PtNairob/lib_layer2_utils/dune b/src/proto_017_PtNairob/lib_layer2_utils/dune index 06513621df0e..bde5ef90e832 100644 --- a/src/proto_017_PtNairob/lib_layer2_utils/dune +++ b/src/proto_017_PtNairob/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name tezos-layer2-utils-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-client-017-PtNairob) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune index d8c86ed1d533..5df35d0ee9c4 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-017-PtNairob.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-017-PtNairob) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob.parameters tezos-protocol-017-PtNairob) (link_flags diff --git a/src/proto_017_PtNairob/lib_plugin/dune b/src/proto_017_PtNairob/lib_plugin/dune index 250c70cf1842..385dd6af7b90 100644 --- a/src/proto_017_PtNairob/lib_plugin/dune +++ b/src/proto_017_PtNairob/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-smart-rollup-017-PtNairob) (flags @@ -22,7 +22,7 @@ (public_name tezos-protocol-plugin-017-PtNairob-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob tezos-validation) diff --git a/src/proto_017_PtNairob/lib_plugin/test/dune b/src/proto_017_PtNairob/lib_plugin/test/dune index f4879c74feb9..eb2c52924ce7 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-base.unix octez-alcotezt tezos-test-helpers qcheck-alcotest - tezos-stdlib-unix - tezos-micheline + octez-libs.tezos-stdlib-unix + octez-libs.tezos-micheline tezos-protocol-plugin-017-PtNairob tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune index c31b6920e468..3cfb11bb497d 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune @@ -8,17 +8,17 @@ (libraries qcheck-alcotest tezos-test-helpers - tezos-base - tezos-micheline - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-micheline + octez-libs.tezos-stdlib-unix tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-017-PtNairob.parameters tezos-protocol-environment tezos-protocol-plugin-017-PtNairob - tezos-shell-services + octez-libs.tezos-shell-services octez-plompiler - tezos-crypto-dal) + octez-libs.tezos-crypto-dal) (flags (:standard) -open Tezos_test_helpers diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune index dcc030dd8cb3..287db929d79c 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune @@ -8,10 +8,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-017-PtNairob-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-017-PtNairob.parameters tezos-protocol-plugin-017-PtNairob) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/dune index c1924d1328de..1c83d9543f3c 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/dune @@ -7,14 +7,14 @@ (libraries tezt.core tezt - tezos-context + octez-libs.tezos-context octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-client-017-PtNairob tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters tezos-017-PtNairob-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune index b020e8428bb0..8034665903fd 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-017-PtNairob-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune index 6479a398b7d2..e6d3fc74a6cf 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune @@ -8,13 +8,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-017-PtNairob-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-client-017-PtNairob tezos-benchmark - tezos-micheline + octez-libs.tezos-micheline tezos-benchmark-017-PtNairob tezos-benchmark-type-inference-017-PtNairob tezos-protocol-plugin-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune index 82399d4d0cc8..82cc97296436 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune @@ -8,11 +8,11 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-017-PtNairob-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-017-PtNairob) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune index c7ae88786777..085005574956 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob qcheck-alcotest tezos-client-017-PtNairob tezos-test-helpers tezos-017-PtNairob-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-017-PtNairob) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune index 5cae4856cbe5..0528986ee801 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-017-PtNairob tezos-protocol-017-PtNairob - tezos-context.merkle_proof_encoding + octez-libs.tezos-context.merkle_proof_encoding tezos-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt @@ -19,8 +19,8 @@ tezos-benchmark-017-PtNairob tezos-benchmark-type-inference-017-PtNairob tezos-smart-rollup-017-PtNairob - tezos-crypto-dal - tezos-base-test-helpers + octez-libs.tezos-crypto-dal + octez-libs.tezos-base-test-helpers tezos-protocol-017-PtNairob.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune index 1bbb272eec4c..ddb3b27992a0 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezt-tezos + octez-libs.tezos-base + octez-libs.tezt-tezos tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob tezos-017-PtNairob-test-helpers - tezos-micheline) + octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index 9f88b1fd4e58..a5baa5ecca6e 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-micheline tezos-client-017-PtNairob tezos-client-base tezos-protocol-017-PtNairob.parameters tezos-protocol-environment - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-017-PtNairob tezos-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt tezos-scoru-wasm-helpers - tezos-stdlib - tezos-crypto-dal + octez-libs.tezos-stdlib + octez-libs.tezos-crypto-dal tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_sc_rollup/dune b/src/proto_017_PtNairob/lib_sc_rollup/dune index 24d3c094204e..99c64d8a6940 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune index 66ae73cb0d90..3211b998ae2c 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-client-commands tezos-client-base diff --git a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune index d46af7ecfe09..384b8f99ecf7 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-layer2-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob octez-injector octez-smart-rollup) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index 142fff8a2770..7ffcb28a5d89 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -6,31 +6,31 @@ (package octez-smart-rollup-node-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix tezos-client-base tezos-client-base-unix tezos-client-017-PtNairob - tezos-context.encoding - tezos-context.helpers + octez-libs.tezos-context.encoding + octez-libs.tezos-context.helpers tezos-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob tezos-protocol-017-PtNairob.parameters - tezos-rpc - tezos-rpc-http - tezos-rpc-http-server - tezos-workers + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server + octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib tezos-dac-lib - tezos-shell-services + octez-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-017-PtNairob tezos-smart-rollup-layer2-017-PtNairob tezos-layer2-utils-017-PtNairob tezos_layer2_store octez-crawler - tezos-tree-encoding + octez-libs.tezos-tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -41,7 +41,7 @@ octez-smart-rollup-node-lib tezos-scoru-wasm tezos-scoru-wasm-fast - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune index a24d4396e07a..bd1a82e8ce4f 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-test-helpers tezos-smart-rollup-layer2-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune index 567647d1e310..6f1fe675034f 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune @@ -6,7 +6,7 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters tezos-client-017-PtNairob diff --git a/src/proto_018_Proxford/bin_accuser/dune b/src/proto_018_Proxford/bin_accuser/dune index 0bb4db7524da..242c82a3aee5 100644 --- a/src/proto_018_Proxford/bin_accuser/dune +++ b/src/proto_018_Proxford/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-client-commands tezos-baking-018-Proxford-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune index 3abe137ede1a..90edd475f29f 100644 --- a/src/proto_018_Proxford/bin_baker/dune +++ b/src/proto_018_Proxford/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-client-commands tezos-baking-018-Proxford-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_018_Proxford/bin_sc_rollup_client/dune b/src/proto_018_Proxford/bin_sc_rollup_client/dune index 90e9c4bfff1a..17a3876a7a67 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_client/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_client/dune @@ -7,7 +7,7 @@ (package octez-smart-rollup-client-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-018-Proxford octez_smart_rollup_client_Proxford diff --git a/src/proto_018_Proxford/bin_sc_rollup_node/dune b/src/proto_018_Proxford/bin_sc_rollup_node/dune index 4c897d488453..5489696725fc 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_node/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune @@ -7,10 +7,10 @@ (package octez-smart-rollup-node-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-018-Proxford - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/proto_018_Proxford/lib_benchmark/dune b/src/proto_018_Proxford/lib_benchmark/dune index 98d2df41bb20..312cc0b40f27 100644 --- a/src/proto_018_Proxford/lib_benchmark/dune +++ b/src/proto_018_Proxford/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_018_Proxford) (public_name tezos-benchmark-018-Proxford) (libraries - tezos-stdlib - tezos-base - tezos-error-monad - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford - tezos-crypto + octez-libs.tezos-crypto tezos-protocol-018-Proxford.parameters hashcons tezos-018-Proxford-test-helpers diff --git a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune index d30a417716bc..822c8faf413f 100644 --- a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-error-monad - tezos-crypto - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad + octez-libs.tezos-crypto + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-018-Proxford hashcons) diff --git a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune index 0b141fefee48..b0ff55b7d6d2 100644 --- a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - tezos-micheline + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford - tezos-error-monad + octez-libs.tezos-error-monad tezos-client-018-Proxford) (link_flags (:standard) diff --git a/src/proto_018_Proxford/lib_benchmark/test/dune b/src/proto_018_Proxford/lib_benchmark/test/dune index 0bf9acd3e0e5..c638edbcbf72 100644 --- a/src/proto_018_Proxford/lib_benchmark/test/dune +++ b/src/proto_018_Proxford/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-018-Proxford tezos-benchmark tezos-benchmark-type-inference-018-Proxford tezos-benchmark-018-Proxford tezos-018-Proxford-test-helpers - tezos-error-monad + octez-libs.tezos-error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune index 49807b0e940f..bd1bb13c3dc3 100644 --- a/src/proto_018_Proxford/lib_benchmarks_proto/dune +++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - tezos-stdlib - tezos-base - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad tezos-protocol-018-Proxford.parameters - tezos-lazy-containers + octez-libs.tezos-lazy-containers tezos-benchmark tezos-benchmark-018-Proxford tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford - tezos-crypto + octez-libs.tezos-crypto tezos-shell-benchmarks - tezos-micheline + octez-libs.tezos-micheline tezos-018-Proxford-test-helpers tezos-sapling tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune index f52cfd928bf2..c6e30cd1f7ef 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-rpc + octez-libs.tezos-rpc tezos-smart-rollup-018-Proxford uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_018_Proxford/lib_client/test/dune b/src/proto_018_Proxford/lib_client/test/dune index f069d09a9425..c40aecb81c87 100644 --- a/src/proto_018_Proxford/lib_client/test/dune +++ b/src/proto_018_Proxford/lib_client/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-018-Proxford tezos-protocol-018-Proxford - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-test-helpers octez-alcotezt qcheck-alcotest) diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune index be57df159547..f50e6e64b0dd 100644 --- a/src/proto_018_Proxford/lib_client_commands/dune +++ b/src/proto_018_Proxford/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-018-Proxford.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-018-Proxford tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-018-Proxford uri) @@ -43,18 +43,18 @@ (public_name tezos-client-018-Proxford.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford tezos-client-commands tezos-client-018-Proxford.commands tezos-client-018-Proxford.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-018-Proxford) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune index 6030734b9641..2c53798f1e00 100644 --- a/src/proto_018_Proxford/lib_client_sapling/dune +++ b/src/proto_018_Proxford/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-018-Proxford.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_dac_plugin/dune b/src/proto_018_Proxford/lib_dac_plugin/dune index efa9ab752cf0..05c3500c4f8e 100644 --- a/src/proto_018_Proxford/lib_dac_plugin/dune +++ b/src/proto_018_Proxford/lib_dac_plugin/dune @@ -6,9 +6,9 @@ (public_name tezos-dac-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dac-lib tezos-dac-client-lib tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_dac_plugin/test/dune b/src/proto_018_Proxford/lib_dac_plugin/test/dune index 9f948b5f0903..9dc2f4065ed8 100644 --- a/src/proto_018_Proxford/lib_dac_plugin/test/dune +++ b/src/proto_018_Proxford/lib_dac_plugin/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dac-018-Proxford tezos-protocol-018-Proxford - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-018-Proxford-test-helpers tezos-dac-lib tezos_dac_node_lib diff --git a/src/proto_018_Proxford/lib_dal/dune b/src/proto_018_Proxford/lib_dal/dune index 49d7ef1d33a2..a0807bb38471 100644 --- a/src/proto_018_Proxford/lib_dal/dune +++ b/src/proto_018_Proxford/lib_dal/dune @@ -6,9 +6,9 @@ (public_name tezos-dal-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dal-node-lib tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford diff --git a/src/proto_018_Proxford/lib_dal/test/dune b/src/proto_018_Proxford/lib_dal/test/dune index 15792106ad47..af55d7089851 100644 --- a/src/proto_018_Proxford/lib_dal/test/dune +++ b/src/proto_018_Proxford/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dal-018-Proxford tezos-protocol-018-Proxford - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index 8a45d13864ed..c6f71371f5aa 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -6,26 +6,26 @@ (public_name tezos-baking-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-version.value tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted tezos-protocol-plugin-018-Proxford tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford tezos-client-commands - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix tezos-shell-context - tezos-context - tezos-context.memory - tezos-rpc-http-client-unix + octez-libs.tezos-context + octez-libs.tezos-context.memory + octez-libs.tezos-rpc-http-client-unix tezos-context-ops - tezos-rpc - tezos-rpc-http + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http tezos-dal-node-services lwt-canceler lwt-exit @@ -55,17 +55,17 @@ (public_name tezos-baking-018-Proxford-commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford tezos-client-commands tezos-baking-018-Proxford - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags @@ -87,16 +87,16 @@ (public_name tezos-baking-018-Proxford-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford tezos-client-commands tezos-baking-018-Proxford tezos-baking-018-Proxford-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_delegate/test/dune b/src/proto_018_Proxford/lib_delegate/test/dune index be5f47d06a4e..a4f148550672 100644 --- a/src/proto_018_Proxford/lib_delegate/test/dune +++ b/src/proto_018_Proxford/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-018-Proxford tezos-protocol-018-Proxford - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-baking-018-Proxford.mockup-simulator tezos-baking-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-crypto + octez-libs.tezos-crypto octez-alcotezt uri) (library_flags (:standard -linkall)) 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 ef1246be03fd..f439baacf9eb 100644 --- a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_018_Proxford_mockup_simulator) (public_name tezos-baking-018-Proxford.mockup-simulator) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-client-commands tezos-baking-018-Proxford - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix tezos-protocol-018-Proxford.parameters tezos-mockup diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune index 43ef233eb026..cb41047c4c68 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base tezos-client-018-Proxford tezos-protocol-018-Proxford 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 379fc93c1133..44af16dfcc4b 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name tezos-baking-018-Proxford.tenderbrute) (libraries data-encoding - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-protocol-018-Proxford tezos-client-base tezos-client-018-Proxford) diff --git a/src/proto_018_Proxford/lib_layer2_utils/dune b/src/proto_018_Proxford/lib_layer2_utils/dune index e5c742ff8c04..e91984f61bd9 100644 --- a/src/proto_018_Proxford/lib_layer2_utils/dune +++ b/src/proto_018_Proxford/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name tezos-layer2-utils-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-client-018-Proxford) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune index cbbb560906b8..05816cdbbc5e 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-018-Proxford.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-018-Proxford) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford.parameters tezos-protocol-018-Proxford) (link_flags diff --git a/src/proto_018_Proxford/lib_plugin/dune b/src/proto_018_Proxford/lib_plugin/dune index 8e4ffc747417..ceb7ffeed6d7 100644 --- a/src/proto_018_Proxford/lib_plugin/dune +++ b/src/proto_018_Proxford/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-smart-rollup-018-Proxford) (flags @@ -22,7 +22,7 @@ (public_name tezos-protocol-plugin-018-Proxford-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-018-Proxford tezos-protocol-plugin-018-Proxford tezos-validation) diff --git a/src/proto_018_Proxford/lib_plugin/test/dune b/src/proto_018_Proxford/lib_plugin/test/dune index 9c89fc72423a..99040f0d1fa0 100644 --- a/src/proto_018_Proxford/lib_plugin/test/dune +++ b/src/proto_018_Proxford/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-base.unix octez-alcotezt tezos-test-helpers qcheck-alcotest - tezos-stdlib-unix - tezos-micheline + octez-libs.tezos-stdlib-unix + octez-libs.tezos-micheline tezos-protocol-plugin-018-Proxford tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune index 2f5782685049..59b845947149 100644 --- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune +++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune @@ -8,17 +8,17 @@ (libraries qcheck-alcotest tezos-test-helpers - tezos-base - tezos-micheline - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-micheline + octez-libs.tezos-stdlib-unix tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-018-Proxford.parameters tezos-protocol-environment tezos-protocol-plugin-018-Proxford - tezos-shell-services + octez-libs.tezos-shell-services octez-plompiler - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-smart-rollup-018-Proxford) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune index 038982c53dab..9c4c3d73b21d 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune @@ -8,10 +8,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-018-Proxford-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-018-Proxford.parameters tezos-protocol-plugin-018-Proxford) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/dune b/src/proto_018_Proxford/lib_protocol/test/integration/dune index 31e173f4a081..888f731fba80 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/dune @@ -7,14 +7,14 @@ (libraries tezt.core tezt - tezos-context + octez-libs.tezos-context octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-client-018-Proxford tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters tezos-018-Proxford-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune index 1caa31389979..cff250ea56c0 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-018-Proxford-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune index fb871a0789ef..1ea2061bb7b6 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune @@ -8,13 +8,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-018-Proxford-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-client-018-Proxford tezos-benchmark - tezos-micheline + octez-libs.tezos-micheline tezos-benchmark-018-Proxford tezos-benchmark-type-inference-018-Proxford tezos-protocol-plugin-018-Proxford diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune index a828d6418188..7eacd37ae802 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune @@ -8,11 +8,11 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-018-Proxford-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-018-Proxford) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune index 0825b35b3cf1..3d582e4d0b69 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford qcheck-alcotest tezos-client-018-Proxford tezos-test-helpers tezos-018-Proxford-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-018-Proxford) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/pbt/dune b/src/proto_018_Proxford/lib_protocol/test/pbt/dune index 73401a09c2ea..00a1b04df50d 100644 --- a/src/proto_018_Proxford/lib_protocol/test/pbt/dune +++ b/src/proto_018_Proxford/lib_protocol/test/pbt/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-018-Proxford tezos-protocol-018-Proxford - tezos-context.merkle_proof_encoding + octez-libs.tezos-context.merkle_proof_encoding tezos-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt @@ -19,8 +19,8 @@ tezos-benchmark-018-Proxford tezos-benchmark-type-inference-018-Proxford tezos-smart-rollup-018-Proxford - tezos-crypto-dal - tezos-base-test-helpers + octez-libs.tezos-crypto-dal + octez-libs.tezos-base-test-helpers tezos-protocol-018-Proxford.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/regression/dune b/src/proto_018_Proxford/lib_protocol/test/regression/dune index 5e53c8f34979..7206fdc25731 100644 --- a/src/proto_018_Proxford/lib_protocol/test/regression/dune +++ b/src/proto_018_Proxford/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezt-tezos + octez-libs.tezos-base + octez-libs.tezt-tezos tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford tezos-018-Proxford-test-helpers - tezos-micheline) + octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index 6ec892ddb8ab..6d544b41d2a2 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-micheline tezos-client-018-Proxford tezos-client-base tezos-protocol-018-Proxford.parameters tezos-protocol-environment - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-018-Proxford tezos-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt tezos-scoru-wasm-helpers - tezos-stdlib - tezos-crypto-dal + octez-libs.tezos-stdlib + octez-libs.tezos-crypto-dal tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_sc_rollup/dune b/src/proto_018_Proxford/lib_sc_rollup/dune index 8cc1b6374fa9..20f643e9af39 100644 --- a/src/proto_018_Proxford/lib_sc_rollup/dune +++ b/src/proto_018_Proxford/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune index 3253c29a92e7..c56f99618df6 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_client/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-client-commands tezos-client-base diff --git a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune index 8469cb791f7b..07dc22f9a1c9 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-layer2-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford octez-injector octez-smart-rollup) diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index e3750e9a4768..2e4b97f0b862 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -6,33 +6,33 @@ (package octez-smart-rollup-node-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix tezos-client-base tezos-client-base-unix tezos-client-018-Proxford - tezos-context.encoding - tezos-context.helpers + octez-libs.tezos-context.encoding + octez-libs.tezos-context.helpers tezos-protocol-018-Proxford tezos-protocol-plugin-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-rpc - tezos-rpc-http - tezos-rpc-http-server - tezos-workers + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server + octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib tezos-dac-018-Proxford tezos-dac-lib tezos-dac-client-lib - tezos-shell-services + octez-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-018-Proxford tezos-smart-rollup-layer2-018-Proxford tezos-layer2-utils-018-Proxford tezos_layer2_store octez-crawler - tezos-tree-encoding + octez-libs.tezos-tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -43,7 +43,7 @@ octez-smart-rollup-node-lib tezos-scoru-wasm tezos-scoru-wasm-fast - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune index b2d60a02a7dc..21dd195ddc62 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-test-helpers tezos-smart-rollup-layer2-018-Proxford diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune b/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune index 4ed79e6d4797..44c5175ca772 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune @@ -6,7 +6,7 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters tezos-client-018-Proxford diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index ca04550668a4..970b90ec42ac 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands tezos-baking-alpha-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 9517ac31650e..a95839e798c5 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands tezos-baking-alpha-commands - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix) (link_flags (:standard) diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index 963bdb7b6682..c8d15359368f 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -7,7 +7,7 @@ (package octez-smart-rollup-client-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-alpha octez_smart_rollup_client_alpha diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 8d3f7eea389f..608392f22b0f 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -7,10 +7,10 @@ (package octez-smart-rollup-node-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-alpha - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/proto_alpha/lib_benchmark/dune b/src/proto_alpha/lib_benchmark/dune index 3a29e3bb29ae..bf09bc6501c9 100644 --- a/src/proto_alpha/lib_benchmark/dune +++ b/src/proto_alpha/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_alpha) (public_name tezos-benchmark-alpha) (libraries - tezos-stdlib - tezos-base - tezos-error-monad - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-alpha tezos-protocol-alpha - tezos-crypto + octez-libs.tezos-crypto tezos-protocol-alpha.parameters hashcons tezos-alpha-test-helpers diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune index d77fee8c6414..dd692f787346 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-stdlib - tezos-error-monad - tezos-crypto - tezos-micheline + octez-libs.tezos-stdlib + octez-libs.tezos-error-monad + octez-libs.tezos-crypto + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-alpha hashcons) diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune index 80cc7e281ace..cd92d4fda3ba 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - tezos-micheline + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-benchmark-type-inference-alpha tezos-protocol-alpha - tezos-error-monad + octez-libs.tezos-error-monad tezos-client-alpha) (link_flags (:standard) diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune index c180fd157a6b..45d57cf34fc8 100644 --- a/src/proto_alpha/lib_benchmark/test/dune +++ b/src/proto_alpha/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-micheline-rewriting tezos-protocol-alpha tezos-benchmark tezos-benchmark-type-inference-alpha tezos-benchmark-alpha tezos-alpha-test-helpers - tezos-error-monad + octez-libs.tezos-error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index dfcf71e1bf12..7d46553450f5 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - tezos-stdlib - tezos-base - tezos-error-monad + octez-libs.tezos-stdlib + octez-libs.tezos-base + octez-libs.tezos-error-monad tezos-protocol-alpha.parameters - tezos-lazy-containers + octez-libs.tezos-lazy-containers tezos-benchmark tezos-benchmark-alpha tezos-benchmark-type-inference-alpha tezos-protocol-alpha - tezos-crypto + octez-libs.tezos-crypto tezos-shell-benchmarks - tezos-micheline + octez-libs.tezos-micheline tezos-alpha-test-helpers tezos-sapling tezos-client-alpha diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index a3782b240c51..aa1693c7c898 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -6,9 +6,9 @@ (public_name tezos-client-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-alpha tezos-protocol-alpha.lifted @@ -17,7 +17,7 @@ tezos-signer-backends tezos-protocol-plugin-alpha tezos-protocol-alpha.parameters - tezos-rpc + octez-libs.tezos-rpc tezos-smart-rollup-alpha uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index 1dcf450e5e58..b23381386783 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-alpha tezos-protocol-alpha - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-test-helpers octez-alcotezt qcheck-alcotest) diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 695b2495f0f6..3edd13238e6f 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -6,20 +6,20 @@ (public_name tezos-client-alpha.commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration tezos-mockup-commands tezos-client-base tezos-client-alpha tezos-client-commands - tezos-rpc + octez-libs.tezos-rpc tezos-client-base-unix tezos-protocol-plugin-alpha uri) @@ -43,18 +43,18 @@ (public_name tezos-client-alpha.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha tezos-client-commands tezos-client-alpha.commands tezos-client-alpha.sapling - tezos-rpc + octez-libs.tezos-rpc tezos-protocol-plugin-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 63e26f9de414..43634c2c9e47 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name tezos-client-alpha.sapling) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic - tezos-crypto - tezos-stdlib-unix + octez-libs.tezos-crypto + octez-libs.tezos-stdlib-unix tezos-client-base tezos-signer-backends tezos-client-alpha diff --git a/src/proto_alpha/lib_dac_plugin/dune b/src/proto_alpha/lib_dac_plugin/dune index ce6fc8440ebb..7637aa825a88 100644 --- a/src/proto_alpha/lib_dac_plugin/dune +++ b/src/proto_alpha/lib_dac_plugin/dune @@ -6,9 +6,9 @@ (public_name tezos-dac-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dac-lib tezos-dac-client-lib tezos-client-alpha diff --git a/src/proto_alpha/lib_dac_plugin/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune index 3f91199cb100..1d061f613158 100644 --- a/src/proto_alpha/lib_dac_plugin/test/dune +++ b/src/proto_alpha/lib_dac_plugin/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dac-alpha tezos-protocol-alpha - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-alpha-test-helpers tezos-dac-lib tezos_dac_node_lib diff --git a/src/proto_alpha/lib_dal/dune b/src/proto_alpha/lib_dal/dune index c434af189c2d..6eaec2697e4a 100644 --- a/src/proto_alpha/lib_dal/dune +++ b/src/proto_alpha/lib_dal/dune @@ -6,9 +6,9 @@ (public_name tezos-dal-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base octez-protocol-compiler.registerer - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-dal-node-lib tezos-client-alpha tezos-protocol-plugin-alpha diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune index 556c1d298977..f0b8638a1797 100644 --- a/src/proto_alpha/lib_dal/test/dune +++ b/src/proto_alpha/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-dal-alpha tezos-protocol-alpha - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-alpha-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 8339c005329e..9c2e7847997b 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -6,26 +6,26 @@ (public_name tezos-baking-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-clic tezos-version.value tezos-protocol-alpha tezos-protocol-alpha.lifted tezos-protocol-plugin-alpha tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha tezos-client-commands - tezos-stdlib - tezos-stdlib-unix + octez-libs.tezos-stdlib + octez-libs.tezos-stdlib-unix tezos-shell-context - tezos-context - tezos-context.memory - tezos-rpc-http-client-unix + octez-libs.tezos-context + octez-libs.tezos-context.memory + octez-libs.tezos-rpc-http-client-unix tezos-context-ops - tezos-rpc - tezos-rpc-http + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http tezos-dal-node-services lwt-canceler lwt-exit @@ -55,17 +55,17 @@ (public_name tezos-baking-alpha-commands) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-protocol-alpha.parameters - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha tezos-client-commands tezos-baking-alpha - tezos-rpc + octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) (flags @@ -87,16 +87,16 @@ (public_name tezos-baking-alpha-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-protocol-environment - tezos-shell-services + octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha tezos-client-commands tezos-baking-alpha tezos-baking-alpha-commands - tezos-rpc) + octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index 95048d5ea590..e3e433983f62 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-alpha tezos-protocol-alpha - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-baking-alpha.mockup-simulator tezos-baking-alpha tezos-protocol-alpha.parameters - tezos-crypto + octez-libs.tezos-crypto octez-alcotezt uri) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune index c459c163af1f..fd23a70fc9d3 100644 --- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_alpha_mockup_simulator) (public_name tezos-baking-alpha.mockup-simulator) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-client-alpha tezos-client-commands tezos-baking-alpha - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-client-base-unix tezos-protocol-alpha.parameters tezos-mockup diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index 6df2252f2558..a3884ee08c60 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - tezos-base + octez-libs.tezos-base tezos-client-base tezos-client-alpha tezos-protocol-alpha diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune index bdeb6478d39c..3c7271584e3a 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name tezos-baking-alpha.tenderbrute) (libraries data-encoding - tezos-base - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base.unix tezos-protocol-alpha tezos-client-base tezos-client-alpha) diff --git a/src/proto_alpha/lib_layer2_utils/dune b/src/proto_alpha/lib_layer2_utils/dune index 0caa6c78b11b..cb846cac4d84 100644 --- a/src/proto_alpha/lib_layer2_utils/dune +++ b/src/proto_alpha/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name tezos-layer2-utils-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-client-alpha) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index 58bd179ad0f8..0d98366e04f3 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-alpha.parameters) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-environment tezos-protocol-alpha) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha.parameters tezos-protocol-alpha) (link_flags diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune index c0ae384ad9c5..674a18ac17dd 100644 --- a/src/proto_alpha/lib_plugin/dune +++ b/src/proto_alpha/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-plugin-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-smart-rollup-alpha) (flags @@ -22,7 +22,7 @@ (public_name tezos-protocol-plugin-alpha-registerer) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-embedded-protocol-alpha tezos-protocol-plugin-alpha tezos-validation) diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index b50965595111..01fcbf13cbab 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-base.unix + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-base.unix octez-alcotezt tezos-test-helpers qcheck-alcotest - tezos-stdlib-unix - tezos-micheline + octez-libs.tezos-stdlib-unix + octez-libs.tezos-micheline tezos-protocol-plugin-alpha tezos-protocol-alpha tezos-protocol-alpha.parameters diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index fe06be369e32..c06875904354 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -8,17 +8,17 @@ (libraries qcheck-alcotest tezos-test-helpers - tezos-base - tezos-micheline - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-micheline + octez-libs.tezos-stdlib-unix tezos-protocol-alpha tezos-client-alpha tezos-protocol-alpha.parameters tezos-protocol-environment tezos-protocol-plugin-alpha - tezos-shell-services + octez-libs.tezos-shell-services octez-plompiler - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-smart-rollup-alpha) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune index 029ff07a2333..e493e5174b01 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-alpha-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-alpha.parameters tezos-protocol-plugin-alpha) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune index 303f8ee1c447..ffc52cbab92f 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -7,14 +7,14 @@ (libraries tezt.core tezt - tezos-context + octez-libs.tezos-context octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-client-alpha tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-alpha-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune index 0614024c0f11..1fed143d4c78 100644 --- a/src/proto_alpha/lib_protocol/test/integration/gas/dune +++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-alpha-test-helpers - tezos-base-test-helpers) + octez-libs.tezos-base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune index b2b7e98360c0..24d5d56ccec9 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-alpha-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-client-alpha tezos-benchmark - tezos-micheline + octez-libs.tezos-micheline tezos-benchmark-alpha tezos-benchmark-type-inference-alpha tezos-protocol-plugin-alpha diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune index 75169b562aff..a9c19bfc3b20 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -7,11 +7,11 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-client-alpha tezos-alpha-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune index 318c86e9b56b..797cfa78d261 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - tezos-base + octez-libs.tezos-base tezos-protocol-alpha qcheck-alcotest tezos-client-alpha tezos-test-helpers tezos-alpha-test-helpers - tezos-base-test-helpers + octez-libs.tezos-base-test-helpers tezos-protocol-plugin-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index b919d1a987a4..1a2502fdd83e 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-micheline tezos-client-alpha tezos-protocol-alpha - tezos-context.merkle_proof_encoding + octez-libs.tezos-context.merkle_proof_encoding tezos-test-helpers tezos-alpha-test-helpers octez-alcotezt @@ -19,8 +19,8 @@ tezos-benchmark-alpha tezos-benchmark-type-inference-alpha tezos-smart-rollup-alpha - tezos-crypto-dal - tezos-base-test-helpers + octez-libs.tezos-crypto-dal + octez-libs.tezos-base-test-helpers tezos-protocol-alpha.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index 63bf7c2bd15d..56c4c7b779f5 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezt-tezos + octez-libs.tezos-base + octez-libs.tezt-tezos tezos-protocol-alpha tezos-client-alpha tezos-protocol-plugin-alpha tezos-alpha-test-helpers - tezos-micheline) + octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 55af460d7482..22cfd82240ce 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base - tezos-base-test-helpers - tezos-micheline + octez-libs.tezos-base + octez-libs.tezos-base-test-helpers + octez-libs.tezos-micheline tezos-client-alpha tezos-client-base tezos-protocol-alpha.parameters tezos-protocol-environment - tezos-stdlib-unix + octez-libs.tezos-stdlib-unix tezos-protocol-alpha tezos-test-helpers tezos-alpha-test-helpers octez-alcotezt tezos-scoru-wasm-helpers - tezos-stdlib - tezos-crypto-dal + octez-libs.tezos-stdlib + octez-libs.tezos-crypto-dal tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune index e725e6fe5150..10ce85b06f39 100644 --- a/src/proto_alpha/lib_sc_rollup/dune +++ b/src/proto_alpha/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune index 0522715ac7cc..7114cd3b104c 100644 --- a/src/proto_alpha/lib_sc_rollup_client/dune +++ b/src/proto_alpha/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-client-commands tezos-client-base diff --git a/src/proto_alpha/lib_sc_rollup_layer2/dune b/src/proto_alpha/lib_sc_rollup_layer2/dune index 304da296654e..faf0ccf31e76 100644 --- a/src/proto_alpha/lib_sc_rollup_layer2/dune +++ b/src/proto_alpha/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name tezos-smart-rollup-layer2-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha octez-injector octez-smart-rollup) diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index 7a3c56138a20..e2364a620469 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -6,33 +6,33 @@ (package octez-smart-rollup-node-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-stdlib-unix tezos-client-base tezos-client-base-unix tezos-client-alpha - tezos-context.encoding - tezos-context.helpers + octez-libs.tezos-context.encoding + octez-libs.tezos-context.helpers tezos-protocol-alpha tezos-protocol-plugin-alpha tezos-protocol-alpha.parameters - tezos-rpc - tezos-rpc-http - tezos-rpc-http-server - tezos-workers + octez-libs.tezos-rpc + octez-libs.tezos-rpc-http + octez-libs.tezos-rpc-http-server + octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib tezos-dac-alpha tezos-dac-lib tezos-dac-client-lib - tezos-shell-services + octez-libs.tezos-shell-services octez-smart-rollup tezos-smart-rollup-alpha tezos-smart-rollup-layer2-alpha tezos-layer2-utils-alpha tezos_layer2_store octez-crawler - tezos-tree-encoding + octez-libs.tezos-tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -43,7 +43,7 @@ octez-smart-rollup-node-lib tezos-scoru-wasm tezos-scoru-wasm-fast - tezos-crypto-dal + octez-libs.tezos-crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune index c9c06b2f86b6..536e46c08243 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-test-helpers tezos-smart-rollup-layer2-alpha diff --git a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune index d8b04b2883ef..c6766c0d16ad 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune @@ -6,7 +6,7 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - tezos-base + octez-libs.tezos-base tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-client-alpha diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune index 48eb6d1e1eb7..d7c0f62b6b3e 100644 --- a/src/proto_demo_counter/lib_client/dune +++ b/src/proto_demo_counter/lib_client/dune @@ -6,8 +6,8 @@ (public_name tezos-client-demo-counter) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-shell-services + octez-libs.tezos-base + octez-libs.tezos-shell-services tezos-client-base tezos-client-commands tezos-protocol-demo-counter diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index 90ffa01ff3e5..b39765280101 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -6,15 +6,15 @@ (public_name tezos-client-genesis) (instrumentation (backend bisect_ppx)) (libraries - tezos-base - tezos-shell-services + octez-libs.tezos-base + octez-libs.tezos-shell-services tezos-client-base tezos-protocol-environment tezos-protocol-genesis tezos-protocol-genesis.lifted tezos-client-commands tezos-proxy - tezos-stdlib-unix) + octez-libs.tezos-stdlib-unix) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune index ce24851c8daf..feb4ef938f51 100644 --- a/tezt/lib_tezos/dune +++ b/tezt/lib_tezos/dune @@ -3,15 +3,15 @@ (library (name tezt_tezos) - (public_name tezt-tezos) + (public_name octez-libs.tezt-tezos) (libraries tezt tezt-performance-regression uri hex - tezos-crypto-dal - tezos-base - tezos-base.unix + octez-libs.tezos-crypto-dal + octez-libs.tezos-base + octez-libs.tezos-base.unix cohttp-lwt-unix) (flags (:standard) diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index d5ae8ea591ad..e7b63f67dba2 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -1,18 +1,18 @@ (executable (name main) (libraries tezt - tezt-tezos + octez-libs.tezt-tezos tezt-performance-regression tezos-lwt-result-stdlib tezos-alpha-test-helpers - tezos-micheline + octez-libs.tezos-micheline tezos-openapi tezos-protocol-alpha qcheck-core tezos-time-measurement data-encoding - tezos-event-logging - tezos-test-helpers + octez-libs.tezos-event-logging + tezos-test-helpers ) (flags (:standard -open Tezt diff --git a/tezt/manual_tests/dune b/tezt/manual_tests/dune index 15bb83eef734..6496d91e168a 100644 --- a/tezt/manual_tests/dune +++ b/tezt/manual_tests/dune @@ -1,7 +1,7 @@ (executable (name main) (libraries - tezt-tezos + octez-libs.tezt-tezos yes_wallet_lib src_proto_alpha_lib_client_test_tezt_lib src_proto_016_PtMumbai_lib_client_test_tezt_lib diff --git a/tezt/remote_tests/dune b/tezt/remote_tests/dune index 031aac7556a3..8d3f57be5285 100644 --- a/tezt/remote_tests/dune +++ b/tezt/remote_tests/dune @@ -1,5 +1,5 @@ (executable (name main) (libraries - tezt-tezos) + octez-libs.tezt-tezos) (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune index d8dba2f9aecc..69eea0b930ae 100644 --- a/tezt/self_tests/dune +++ b/tezt/self_tests/dune @@ -7,7 +7,7 @@ (libraries tezt.core tezt - tezt-tezos) + octez-libs.tezt-tezos) (library_flags (:standard -linkall)) (flags (:standard) @@ -28,7 +28,7 @@ (rule (alias runtest) - (package tezt-tezos) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/tezt/snoop/dune b/tezt/snoop/dune index 031aac7556a3..8d3f57be5285 100644 --- a/tezt/snoop/dune +++ b/tezt/snoop/dune @@ -1,5 +1,5 @@ (executable (name main) (libraries - tezt-tezos) + octez-libs.tezt-tezos) (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/tests/dune b/tezt/tests/dune index f7737643ef9d..14b678cbe2c0 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -9,12 +9,12 @@ tezt str bls12-381 - tezt-tezos + octez-libs.tezt-tezos tezt_ethereum data-encoding - tezos-base - tezos-base.unix - tezos-stdlib-unix + octez-libs.tezos-base + octez-libs.tezos-base.unix + octez-libs.tezos-stdlib-unix tezos-protocol-alpha tezos_scoru_wasm_regressions tezt_self_tests_tezt_lib diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index 08dc551f6295..0f1bce4abff7 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -1,10 +1,10 @@ (executable (name main) - (libraries tezos-stdlib + (libraries octez-libs.tezos-stdlib tezos-alpha-test-helpers - tezos-micheline + octez-libs.tezos-micheline tezos-protocol-alpha - tezt-tezos + octez-libs.tezt-tezos ptime) (flags (:standard (:include %{workspace_root}/macos-link-flags.sexp) -- GitLab From 3dc6614623cca6cbadeedf96923e81e6ca75798d Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 31 May 2023 15:32:15 +0200 Subject: [PATCH 3/3] Docs: Update documentation with Octez-libs --- docs/alpha/plugins.rst | 2 +- docs/developer/guidelines.rst | 2 +- .../merkle-proof-encoding-formats.rst | 2 +- docs/developer/testing.rst | 2 +- docs/nairobi/plugins.rst | 2 +- docs/oxford/plugins.rst | 2 +- docs/shell/p2p.rst | 2 +- docs/shell/storage.rst | 4 +- docs/shell/the_big_picture.rst | 47 ++++++++++--------- 9 files changed, 34 insertions(+), 31 deletions(-) diff --git a/docs/alpha/plugins.rst b/docs/alpha/plugins.rst index 44e97cad5693..7bc7c1e3c852 100644 --- a/docs/alpha/plugins.rst +++ b/docs/alpha/plugins.rst @@ -50,7 +50,7 @@ the filters of the previous protocol. Notice that prevalidator filters are not mandatory, their absence does not break the Tezos blockchain protocol. The interface of the prevalidator plugin is described at the :package-api:`mempool plugin API -`. +`. The different kinds of prevalidator filters are described below. diff --git a/docs/developer/guidelines.rst b/docs/developer/guidelines.rst index 9200a41d1361..32d2d28fdb8b 100644 --- a/docs/developer/guidelines.rst +++ b/docs/developer/guidelines.rst @@ -640,7 +640,7 @@ Lwt-, Result-, and Lwt-Result-specific variants of all the traversal functions (``map``, ``iter``, ``for_all``, ``exists``, etc.) Check the -:package-api:`online documentation ` for a full list of the content of the ``List`` module. +:package-api:`online documentation ` for a full list of the content of the ``List`` module. .. _chaining_concat_map: diff --git a/docs/developer/merkle-proof-encoding-formats.rst b/docs/developer/merkle-proof-encoding-formats.rst index efef44ada510..18a0c1b689dc 100644 --- a/docs/developer/merkle-proof-encoding-formats.rst +++ b/docs/developer/merkle-proof-encoding-formats.rst @@ -12,7 +12,7 @@ This document shows the encoding format of the Merkle proof implemented in :src: There are 2 versions of encodings (defined as V1 and V2), each generating 2 types of Merkle proofs (named tree_proof and stream_proof), for 2 types of Irmin Trees (32-tree and binary tree). The data structure is defined in -:src:`src/lib_context/sigs/context.ml` (:package-api:`API `) as below. +:src:`src/lib_context/sigs/context.ml` (:package-api:`API `) as below. The internal structure of Irmin, which is used to manage contexts in Octez, appears in it. Encoding formats give the conversion between a ``tree_proof`` and a byte sequence, and between a ``stream_proof`` and a byte sequence. diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index 03ded8851dec..09c018134877 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/plugins.rst b/docs/nairobi/plugins.rst index cd577824fb0b..7313d88cb4c0 100644 --- a/docs/nairobi/plugins.rst +++ b/docs/nairobi/plugins.rst @@ -51,7 +51,7 @@ the filters of the previous protocol. Notice that prevalidator filters are not mandatory, their absence does not break the Tezos blockchain protocol. The interface of the prevalidator plugin is described at the :package-api:`mempool plugin API -`. +`. The different kinds of prevalidator filters are described below. diff --git a/docs/oxford/plugins.rst b/docs/oxford/plugins.rst index 789b17824e98..555c308dce28 100644 --- a/docs/oxford/plugins.rst +++ b/docs/oxford/plugins.rst @@ -50,7 +50,7 @@ the filters of the previous protocol. Notice that prevalidator filters are not mandatory, their absence does not break the Tezos blockchain protocol. The interface of the prevalidator plugin is described at the :package-api:`mempool plugin API -`. +`. The different kinds of prevalidator filters are described below. diff --git a/docs/shell/p2p.rst b/docs/shell/p2p.rst index 79871a557470..59ebb53a32d5 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:`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/storage.rst b/docs/shell/storage.rst index 61b203e55452..b5d5b6da5555 100644 --- a/docs/shell/storage.rst +++ b/docs/shell/storage.rst @@ -165,9 +165,9 @@ The Store maintains data on disk in the Context ####### -The context component is the the :package:`tezos-context` package, implemented in the :src:`src/lib_context` +The context component is the the :package-api:`tezos-context ` package, implemented in the :src:`src/lib_context` library. It is a versioned key/value store that associates to each -block a view of its ledger state. The :package-api:`on-disk context API ` exports versioning concepts similar +block a view of its ledger state. The :package-api:`on-disk context API ` exports versioning concepts similar to `Git `_. The current implementation is using `Irmin `_ as a backend. diff --git a/docs/shell/the_big_picture.rst b/docs/shell/the_big_picture.rst index 7b6d22012635..20a6f92f78d1 100644 --- a/docs/shell/the_big_picture.rst +++ b/docs/shell/the_big_picture.rst @@ -77,7 +77,7 @@ interoperable, and auto descriptive, using JSON schema. Software Architecture and Packages Relationship ------------------------------------------------ The diagram below shows the main OPAM packages present in the source -code of Tezos, and their dependencies. The ``tezos-`` prefix has been +code of Tezos, and their dependencies. The ``tezos-`` or ``octez-`` prefixes have been dropped for clarity. |Tezos source packages diagram| @@ -90,43 +90,46 @@ blue, contains modules that bear no dependency to Unix, and can thus 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.) + Base and below ~~~~~~~~~~~~~~ -At the center, the :package:`tezos-base` package is where +At the center, the :package-api:`tezos-base ` package is where the blockchain specific code starts. Above it in the figure (but below in terms of abstraction level) is the set of libraries that are used everywhere for basic operations. - - :package:`tezos-stdlib` contains a few extensions over the + - :package-api:`tezos-stdlib ` contains a few extensions over the OCaml standard library (a few string primitives, an ``Option`` module, etc.), a few ``Lwt`` utilities, and a ``Compare`` module that implements monomorphic comparison operators. - - :package:`tezos-error-monad` is an in-house monadic + - :package-api:`tezos-error-monad ` is an in-house monadic interface to the OCaml ``('a, 'b) result`` type, that fixes the ``'b`` to an extensible type ``error`` (actually a list, to hold an error trace). When extending the type, programmers must also call the ``register_error`` function that registers a pretty printer and an encoding for serialization. A :doc:`tutorial<../developer/error_monad>` is available for this library. - - :package:`tezos-rpc` provides the basics of Tezos' RPC service + - :package-api:`tezos-rpc ` provides the basics of Tezos' RPC service mechanism. It provides combinators for building service hierarchies à la Ocsigen/Eliom, registering, and calling services. This module is based on :opam:`resto`, that allows for automatic generation of machine and human-readable descriptions of the hierarchy of services, including: the structure of URLs and the expected formats for input and output bodies, via the use of ``data_encoding``. - - :package:`tezos-crypto` wraps the external cryptography + - :package-api:`tezos-crypto ` wraps the external cryptography libraries that we use. We try to use minimal reference implementations, with as thin as possible bindings, and rely on libraries from the `HACL* project `_, written and verified in the F* programming language, and extracted to C. - - :package:`tezos-micheline` is the concrete syntax used by + - :package-api:`tezos-micheline ` is the concrete syntax used by Michelson, the language of smart contracts. It mostly contains the generic, untyped AST, a printer, and a parser. - - :package:`tezos-base` wraps all these modules in a common foundation + - :package-api:`tezos-base ` wraps all these modules in a common foundation for all the other components of Tezos, and introduces the data structures of the blockchain (e.g. ``Block_hash``, ``Block_header``, ``Block_locator``, ``Fitness``, ``P2p_identity``) @@ -146,21 +149,21 @@ 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:`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 description of services is done here. The registration of handlers is done in the rest of the node's implementation. - - :package:`tezos-rpc-http-client` and :package:`tezos-rpc-http-server` + - :package-api:`tezos-rpc-http-client ` and :package-api:`tezos-rpc-http-server ` use :opam:`cohttp` to implement the RPC over HTTP server and client, allowing to make actual use of - services declared using :package:`tezos-rpc`. - - :package:`tezos-p2p` is the in-house peer-to-peer layer. + 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 on-disk block storage, snapshots exporting/importing and chain reconstruction. - - :package:`tezos-context` contains the raw versioned key-value store + - :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 @@ -254,7 +257,7 @@ compatible, and library vs command-line interface. 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:`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. @@ -277,29 +280,29 @@ 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-name:`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-name:`tezos-protocol-environment` + - :package:`tezos-protocol-environment` (in directory :src:`src/lib_protocol_environment/test/`): tests for the in-memory context implementation. - - :package-name:`tezos-shell` + - :package:`tezos-shell` (in directory :src:`src/lib_shell/test/`): tests for the chain data storage. - - :package-name:`tezos-stdlib` + - :package-api:`tezos-stdlib ` (in directory :src:`src/lib_stdlib/test/`): tests for the basic data structures. - - :package-name:`tezos-context` + - :package-api:`tezos-context ` (in directory :src:`src/lib_context/test/`): tests for the versioned key-value context. - - :package-name:`tezos-store` + - :package:`tezos-store` (in directory :src:`src/lib_store/unix/test/`): tests for the on-disk store. - - :package-name:`tezos-protocol-alpha` + - :package:`tezos-protocol-alpha` (in directory :src:`src/proto_alpha/lib_protocol/test/`): tests of the Alpha protocol (without launching a node). - - :package-name:`tezos-crypto` + - :package-api:`tezos-crypto ` (in directory :src:`src/lib_crypto/test/`): tests for the in-house merkle trees. -- GitLab