diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 79a0d37c6d30907bd569580cad8394f25b7e7a3a..ebc86bb7a231216a31641bccc3f6982bad53faa9 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -479,7 +479,7 @@ opam:octez-codec: opam:octez-crawler: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: octez-crawler @@ -524,10 +524,17 @@ opam:octez-distributed-lwt-internal: opam:octez-injector: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: octez-injector +opam:octez-l2-libs: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: octez-l2-libs + opam:octez-libs: extends: - .opam_template @@ -538,21 +545,28 @@ opam:octez-libs: opam:octez-node: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_2 + - .rules_template__trigger_exec_opam_batch_1 variables: package: octez-node opam:octez-node-config: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: octez-node-config +opam:octez-proto-libs: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: octez-proto-libs + opam:octez-protocol-compiler: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_5 + - .rules_template__trigger_exec_opam_batch_6 variables: package: octez-protocol-compiler @@ -563,19 +577,21 @@ opam:octez-proxy-server: variables: package: octez-proxy-server -opam:octez-signer: +opam:octez-shell-libs: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_2 + - .rules_template__trigger_all_opam_batch_5 variables: - package: octez-signer + package: octez-shell-libs -opam:octez-smart-rollup: +# Ignoring unreleased package octez-shell-tests. + +opam:octez-signer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_exec_opam_batch_3 variables: - package: octez-smart-rollup + package: octez-signer opam:octez-smart-rollup-client-Proxford: extends: @@ -622,10 +638,6 @@ opam:octez-smart-rollup-node-lib: # Ignoring unreleased package octez-smart-rollup-sequencer-node. -# Ignoring unreleased package octez-smart-rollup-wasm-benchmark. - -# Ignoring unreleased package octez-smart-rollup-wasm-benchmark-lib. - opam:octez-smart-rollup-wasm-debugger: extends: - .opam_template @@ -635,9 +647,9 @@ opam:octez-smart-rollup-wasm-debugger: # Ignoring unreleased package octez-snoop. -# Ignoring unreleased package octez-testnet-scenarios. +# Ignoring unreleased package octez-store-tests. -# Ignoring unreleased package octez-wasmer-test. +# Ignoring unreleased package octez-testnet-scenarios. # Ignoring unreleased package octogram. @@ -706,7 +718,12 @@ opam:tezos-baking-alpha-commands: variables: package: tezos-baking-alpha-commands -# Ignoring unreleased package tezos-benchmark. +opam:tezos-benchmark: + extends: + - .opam_template + - .rules_template__trigger_all_opam_batch_7 + variables: + package: tezos-benchmark # Ignoring unreleased package tezos-benchmark-017-PtNairob. @@ -796,49 +813,49 @@ opam:tezos-client-008-PtEdo2Zk: opam:tezos-client-009-PsFLoren: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-009-PsFLoren opam:tezos-client-010-PtGRANAD: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-010-PtGRANAD opam:tezos-client-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-011-PtHangz2 opam:tezos-client-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-012-Psithaca opam:tezos-client-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-013-PtJakart opam:tezos-client-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-014-PtKathma opam:tezos-client-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-015-PtLimaPt @@ -870,48 +887,20 @@ opam:tezos-client-alpha: variables: package: tezos-client-alpha -opam:tezos-client-base: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-client-base - -opam:tezos-client-base-unix: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_3 - variables: - package: tezos-client-base-unix - -opam:tezos-client-commands: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_4 - variables: - package: tezos-client-commands - opam:tezos-client-demo-counter: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-demo-counter opam:tezos-client-genesis: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-genesis -opam:tezos-context-ops: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-context-ops - opam:tezos-dac-017-PtNairob: extends: - .opam_template @@ -967,14 +956,14 @@ opam:tezos-dac-node-lib: opam:tezos-dal-node-lib: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-dal-node-lib 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 @@ -1100,21 +1089,21 @@ opam:tezos-embedded-protocol-014-PtKathma: opam:tezos-embedded-protocol-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-015-PtLimaPt opam:tezos-embedded-protocol-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-016-PtMumbai opam:tezos-embedded-protocol-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-017-PtNairob @@ -1153,13 +1142,6 @@ opam:tezos-embedded-protocol-genesis: variables: package: tezos-embedded-protocol-genesis -opam:tezos-layer2-store: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-layer2-store - # Ignoring unreleased package tezos-layer2-utils-016-PtMumbai. opam:tezos-layer2-utils-017-PtNairob: @@ -1182,34 +1164,6 @@ opam:tezos-layer2-utils-018-Proxford: # Ignoring unreleased package tezos-micheline-rewriting. -opam:tezos-mockup: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-mockup - -opam:tezos-mockup-commands: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_3 - variables: - package: tezos-mockup-commands - -opam:tezos-mockup-proxy: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-mockup-proxy - -opam:tezos-mockup-registration: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-mockup-registration - # Ignoring unreleased package tezos-openapi. opam:tezos-protocol-000-Ps9mPmXa: @@ -1306,42 +1260,42 @@ opam:tezos-protocol-010-PtGRANAD: opam:tezos-protocol-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-011-PtHangz2 opam:tezos-protocol-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-012-Psithaca opam:tezos-protocol-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-013-PtJakart opam:tezos-protocol-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-014-PtKathma opam:tezos-protocol-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-015-PtLimaPt opam:tezos-protocol-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-016-PtMumbai @@ -1403,7 +1357,7 @@ opam:tezos-protocol-plugin-007-PsDELPH1: opam:tezos-protocol-plugin-007-PsDELPH1-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-007-PsDELPH1-registerer @@ -1417,7 +1371,7 @@ opam:tezos-protocol-plugin-008-PtEdo2Zk: opam:tezos-protocol-plugin-008-PtEdo2Zk-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-008-PtEdo2Zk-registerer @@ -1431,7 +1385,7 @@ opam:tezos-protocol-plugin-009-PsFLoren: opam:tezos-protocol-plugin-009-PsFLoren-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-009-PsFLoren-registerer @@ -1445,7 +1399,7 @@ opam:tezos-protocol-plugin-010-PtGRANAD: opam:tezos-protocol-plugin-010-PtGRANAD-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-010-PtGRANAD-registerer @@ -1459,7 +1413,7 @@ opam:tezos-protocol-plugin-011-PtHangz2: opam:tezos-protocol-plugin-011-PtHangz2-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-011-PtHangz2-registerer @@ -1473,7 +1427,7 @@ opam:tezos-protocol-plugin-012-Psithaca: opam:tezos-protocol-plugin-012-Psithaca-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-012-Psithaca-registerer @@ -1487,7 +1441,7 @@ opam:tezos-protocol-plugin-013-PtJakart: opam:tezos-protocol-plugin-013-PtJakart-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-protocol-plugin-013-PtJakart-registerer @@ -1508,7 +1462,7 @@ opam:tezos-protocol-plugin-014-PtKathma-registerer: opam:tezos-protocol-plugin-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-015-PtLimaPt @@ -1559,7 +1513,7 @@ opam:tezos-protocol-plugin-018-Proxford: opam:tezos-protocol-plugin-018-Proxford-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-018-Proxford-registerer @@ -1575,26 +1529,12 @@ opam:tezos-protocol-plugin-alpha: opam:tezos-protocol-plugin-alpha-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-alpha-registerer # Ignoring unreleased package tezos-protocol-plugin-alpha-tests. -opam:tezos-protocol-updater: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-protocol-updater - -opam:tezos-proxy: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-proxy - opam:tezos-proxy-server-config: extends: - .opam_template @@ -1604,59 +1544,12 @@ opam:tezos-proxy-server-config: # Ignoring unreleased package tezos-sc-rollup-node-test. -# Ignoring unreleased package tezos-scoru-wasm-durable-snapshot. - -opam:tezos-scoru-wasm-fast: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-scoru-wasm-fast - -# Ignoring unreleased package tezos-scoru-wasm-fast-test. - -opam:tezos-scoru-wasm-helpers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-scoru-wasm-helpers - # Ignoring unreleased package tezos-scoru-wasm-regressions. -# Ignoring unreleased package tezos-scoru-wasm-test. - -# Ignoring unreleased package tezos-scoru-wasm-test-helpers. - -opam:tezos-shell: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_3 - variables: - package: tezos-shell - -# Ignoring unreleased package tezos-shell-benchmarks. - -# Ignoring unreleased package tezos-shell-context-test. - -opam:tezos-signer-backends: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-signer-backends - -opam:tezos-signer-services: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-signer-services - opam:tezos-smart-rollup-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-smart-rollup-016-PtMumbai @@ -1686,39 +1579,25 @@ opam:tezos-smart-rollup-alpha: opam:tezos-smart-rollup-layer2-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-smart-rollup-layer2-017-PtNairob opam:tezos-smart-rollup-layer2-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: tezos-smart-rollup-layer2-018-Proxford # Ignoring unreleased package tezos-smart-rollup-layer2-alpha. -opam:tezos-store: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_4 - variables: - package: tezos-store - # Ignoring unreleased package tezos-tooling. # Ignoring unreleased package tezos-tps-evaluation. # Ignoring unreleased package tezos-tree-encoding-test. -opam:tezos-validation: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: tezos-validation - opam:tezos-version: extends: - .opam_template @@ -1726,18 +1605,11 @@ opam:tezos-version: variables: package: tezos-version -opam:tezos-wasmer: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-wasmer +# Ignoring unreleased package tezt-ethereum. -opam:tezos-webassembly-interpreter-extra: +opam:tezt-tezos: extends: - .opam_template - .rules_template__trigger_all_opam_batch_7 variables: - package: tezos-webassembly-interpreter-extra - -# Ignoring unreleased package tezt-ethereum. + package: tezt-tezos diff --git a/contrib/bin_codec/dune b/contrib/bin_codec/dune index ecb1a9e1c0f7f3ab2dcf28ff6df4fabc9258897c..f5173cb96a9295a1aea17d64054087eef2a9ce2a 100644 --- a/contrib/bin_codec/dune +++ b/contrib/bin_codec/dune @@ -10,12 +10,12 @@ data-encoding octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base-unix - tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-base octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-event-logging - tezos-signer-services + octez-shell-libs.tezos-signer-services tezos-version.value kaitai.kaitai-of-data-encoding kaitai.ast diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index ad80875a2bc089f05315658f262a5a7c91aabfb2..c8c615235227ae0115a52651ca3672ea4f922183 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -6,7 +6,7 @@ (libraries octez-libs.tezos-micheline octez-libs.tezos-base - tezos-store + octez-shell-libs.tezos-store tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-018-Proxford diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune index 69b4ecc75d2105fc30d7071cece3acf38e782873..717c94cfd5ec80dc54f1d91be98446b3707ab58c 100644 --- a/devtools/testnet_experiment_tools/dune +++ b/devtools/testnet_experiment_tools/dune @@ -5,8 +5,8 @@ (name testnet_experiment_tools) (libraries tezt - octez-libs.tezt-tezos - tezos-client-base-unix + tezt-tezos + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix @@ -30,8 +30,8 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-baking-017-PtNairob tezos-client-017-PtNairob tezos-client-017-PtNairob.commands @@ -60,13 +60,13 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-store + octez-shell-libs.tezos-store octez-libs.tezos-clic - tezos-store.unix-snapshots - tezos-store.shared + octez-shell-libs.tezos-store.unix-snapshots + octez-shell-libs.tezos-store.shared octez-node-config - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix simulation_scenario_lib) (link_flags (:standard) diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 89454bdf42287929072d29683f50291d22026aff..eb74ff5ff3607df11d295c8b7563f307323f4147 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -8,8 +8,8 @@ octez-libs.tezos-base.unix lwt.unix ezjsonm - tezos-store - octez-libs.tezos-shell-context + octez-shell-libs.tezos-store + octez-shell-libs.tezos-shell-context octez-libs.tezos-context tezos-protocol-017-PtNairob tezos-protocol-018-Proxford diff --git a/docs/alpha/validation.rst b/docs/alpha/validation.rst index 9eaad6f2ef837b155cf3408cca467a9893ff931b..8e486eb9817ab63d80597a8ff2d3692ac36a5466 100644 --- a/docs/alpha/validation.rst +++ b/docs/alpha/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V10``, and it is implemented by this protocol in the diff --git a/docs/developer/contributing-adding-a-new-opam-dependency.rst b/docs/developer/contributing-adding-a-new-opam-dependency.rst index 07be56ef5c88beaa9cf61204340230253c4c5058..7865f9728a44d590ab8d976c23d0bbab545c7b69 100644 --- a/docs/developer/contributing-adding-a-new-opam-dependency.rst +++ b/docs/developer/contributing-adding-a-new-opam-dependency.rst @@ -50,7 +50,7 @@ For example, if you are modifying the Shell using the new dependency, you must add an entry in the ``~deps`` list of the ``let octez_shell =`` entry of the :src:`manifest/main.ml` and then run ``make -C manifest``. You should see the changes propagated onto -:src:`opam/tezos-shell.opam` and :src:`src/lib_shell/dune`. +:src:`opam/octez-libs.opam` and :src:`src/lib_shell/dune`. **Add dependencies to build files:** both opam files and dune files must be updated. diff --git a/docs/developer/long-tezts.rst b/docs/developer/long-tezts.rst index eeac39de09e0007a897ada03d388989f759dbd64..3d848200279673c530baecdb23e8f35cc969bfe2 100644 --- a/docs/developer/long-tezts.rst +++ b/docs/developer/long-tezts.rst @@ -219,7 +219,7 @@ Configuring and Running Tezt Long Tests ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ For more information about how to use the configuration file, please refer -to the :package-api:`Long test module API `. +to the `Long test module API `__. A predefined configuration has already been shipped in :src:`tezt/lib_performance_regression/local-sandbox/tezt_config.json`. It allows to use the InfluxDB and Grafana instances set up by the diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index 8da2e51de31f3de5c860948b942e6f46d1b026db..5af4879c0811333b89cff3e0cee28a608303e038 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/doc_gen/dune b/docs/doc_gen/dune index 72d85e7167be6c6d634b43cfcb76405d897976fd..e26c6968cba4dd9e3676735dbc8f081f3222a207 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -4,9 +4,9 @@ (libraries octez-libs.tezos-base octez-libs.tezos-rpc octez-libs.tezos-stdlib-unix - tezos-shell + octez-shell-libs.tezos-shell octez-libs.tezos-rpc-http-server - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater ; TODO tezos/tezos#2170: adapt next line(s) tezos-embedded-protocol-genesis tezos-embedded-protocol-016-PtMumbai diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune index aca73b55195e158aac0c8c77925dbe340e4bf733..169ee09d06838b06509db8adab796614b4249bb8 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -1,7 +1,7 @@ (executable (name error_doc) (libraries data-encoding - tezos-shell + octez-shell-libs.tezos-shell tezos-client-alpha) (flags (:standard -open Tezos_base -open Tezos_error_monad diff --git a/docs/nairobi/validation.rst b/docs/nairobi/validation.rst index 75a8a3e8263e31e059cd76650980d1e5f7666bb7..561924426ccc05dd19a7e2d75ce8e303446f4d63 100644 --- a/docs/nairobi/validation.rst +++ b/docs/nairobi/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V8``, and it is implemented by this protocol in the diff --git a/docs/oxford/validation.rst b/docs/oxford/validation.rst index a0b0ddad6ec28c8a0f33e0596153d131b0e43e3c..108c44aff171e4d938a9d7d855cc23a101f5af21 100644 --- a/docs/oxford/validation.rst +++ b/docs/oxford/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V10``, and it is implemented by this protocol in the diff --git a/docs/shell/p2p.rst b/docs/shell/p2p.rst index 59ebb53a32d5fa4725ab8adfe841d37ea1c3e4d7..3be7bfc47b7f7609f87b032dfef5d9f1b7398ccc 100644 --- a/docs/shell/p2p.rst +++ b/docs/shell/p2p.rst @@ -17,7 +17,7 @@ The P2P layer is comprised of a pool of connections, a set of operations on those connections, and a set of workers following the worker pattern pervasively used in the codebase. -The P2P layer is packaged in :package-api:`tezos-p2p `, which has +The P2P layer is packaged in :package-api:`tezos-p2p `, which has documentation for all modules. General operation diff --git a/docs/shell/protocol_environment.rst b/docs/shell/protocol_environment.rst index 1fea472016098a0daa62871d008ecf69e4b1abea..711174606552064854434491aaad06e88e36e81f 100644 --- a/docs/shell/protocol_environment.rst +++ b/docs/shell/protocol_environment.rst @@ -54,7 +54,7 @@ Here is a quick description of each file in this environment, all located under implementations are assembled into a single implementation file ``VX.ml`` by a helper program located in ``s_packer/``. -The API can be found in :package-api:`tezos-protocol-environment ` +The API can be found in :package-api:`tezos-protocol-environment ` Environment versions diff --git a/docs/shell/storage.rst b/docs/shell/storage.rst index b5d5b6da5555109ac5eb8ff7efe1e629eb455490..90f582c3dad6918586768610414dea9f97157f26 100644 --- a/docs/shell/storage.rst +++ b/docs/shell/storage.rst @@ -14,7 +14,7 @@ providing storage abstractions for blockchain data such as blocks and operations Store ##### -The store component is the :package:`tezos-store` package implemented in the :src:`src/lib_store` library. It handles the on-disk storage of static objects such as +The store component is the :package-api:`Tezos_store ` module implemented in the :src:`src/lib_store` directory. It handles the on-disk storage of static objects such as blocks, operations, block's metadata, protocols and chain data. The store also handles the chain's current state: current head, invalid blocks, active test chains, etc. The store component is designed to diff --git a/docs/shell/the_big_picture.rst b/docs/shell/the_big_picture.rst index e907531e5cc39532b7d1a6a8ec23885e3526c37b..2f0332cddadb3a758742a3a93bf811e1350945e2 100644 --- a/docs/shell/the_big_picture.rst +++ b/docs/shell/the_big_picture.rst @@ -91,7 +91,7 @@ be compiled to JavaScript. External dependencies are not shown in this illustration. Note that many packages described below are grouped in a single one: :package:`octez-libs`. -This includes packages as diverse as :package-api:`tezos-stdlib `, :package-api:`tezos-base `, :package-api:`tezos-shell-services `, :package-api:`tezos-context `, etc.) +This includes packages as diverse as :package-api:`tezos-stdlib `, :package-api:`tezos-base `, :package-api:`tezos-shell-services `, :package-api:`tezos-context `, etc.) Base and below ~~~~~~~~~~~~~~ @@ -149,7 +149,7 @@ The shell is the part of the node responsible for all communications, peer-to-peer and RPC, acting as a cocoon around the economic protocols. - - :package-api:`tezos-shell-services ` contains the definition of the + - :package-api:`tezos-shell-services ` contains the definition of the node's service hierarchy, and calling functions to use in the client (or any third party software). As this library is linked into the client to call the services in a type-safe way, only the @@ -159,16 +159,16 @@ protocols. use :opam:`cohttp` to implement the RPC over HTTP server and client, allowing to make actual use of services declared using :package-api:`tezos-rpc `. - - :package-api:`tezos-p2p ` is the in-house peer-to-peer layer. - - :package:`tezos-store` is the chain-data store that handles + - :package-api:`tezos-p2p ` is the in-house peer-to-peer layer. + - :package-api:`tezos-store ` is the chain-data store that handles on-disk block storage, snapshots exporting/importing and chain reconstruction. - :package-api:`tezos-context ` contains the raw versioned key-value store used for storing the ledger's context (one version per block). This is implemented using :opam:`irmin`. - - :package:`tezos-protocol-updater` maintains the table of available + - :package-api:`tezos-protocol-updater ` maintains the table of available protocol versions, embedded or dynamically linked. - - :package:`tezos-shell` implements the scheduling of block + - :package-api:`tezos-shell ` implements the scheduling of block validations, the mempool management, and the distributed database. A description is available in :doc:`this document <../shell/validation>`. @@ -181,7 +181,7 @@ economic protocol, as a form of static sandboxing. It also generates a functorized version of the protocol, to make the execution of the protocol in an alternative environment possible. - - :package-api:`tezos-protocol-environment ` contains the protocol + - :package-api:`tezos-protocol-environment ` contains the protocol generic environment, that is the API of the modules that are available to the economic protocol and the exported protocol API. A review of this sandbox is available :doc:`here <../shell/protocol_environment>`. @@ -202,7 +202,7 @@ protocol in an alternative environment possible. standard library as a parameter. This parameter can be filled with any of the implementations described in the two points below. - - :package-api:`tezos-shell-context ` implements a context representation + - :package-api:`tezos-shell-context ` implements a context representation that is accepted by the protocol environment. The node uses this instance to read and write data on disk. @@ -253,11 +253,11 @@ The client is split into many packages, to enforce three separation lines: shell vs economic protocol, Unix dependent vs JavaScript compatible, and library vs command-line interface. - - :package:`tezos-client-base` defines the client context, which is + - :package-api:`tezos-client-base ` defines the client context, which is an object whose methods allow for: accessing a wallet of keys, interacting via the user, making RPC calls, and signing data using signer plug-ins. Most of them, including RPC calling functions from - :package-api:`tezos-shell-services ` and + :package-api:`tezos-shell-services ` and :package:`tezos-protocol-alpha`, are abstracted over this object type. That way, it is possible to use the same code for different platforms or toolkits. @@ -266,7 +266,7 @@ compatible, and library vs command-line interface. the client context. - :package:`tezos-client-genesis` contains the basic activator commands available on the genesis protocol. - - :package:`tezos-client-base-unix` implements configuration file + - :package-api:`tezos-client-base-unix ` implements configuration file and wallet storage in Unix files, user interaction via the Unix console, and terminal based signer plug-ins. @@ -280,14 +280,14 @@ run them. - :src:`tezt/`: end-to-end tests as Tezt tests that e.g. launch local sandboxed nodes and performs various tasks using the client - - :package-api:`tezos-p2p ` + - :package-api:`tezos-p2p ` (in directory :src:`src/lib_p2p/test/`): tests of the peer-to-peer layer, independently of the Tezos gossip protocol (establishing connections, propagating peers, etc.) - - :package-api:`tezos-protocol-environment ` + - :package-api:`tezos-protocol-environment ` (in directory :src:`src/lib_protocol_environment/test/`): tests for the in-memory context implementation. - - :package:`tezos-shell` + - :package-api:`tezos-shell ` (in directory :src:`src/lib_shell/test/`): tests for the chain data storage. - :package-api:`tezos-stdlib ` @@ -296,7 +296,7 @@ run them. - :package-api:`tezos-context ` (in directory :src:`src/lib_context/test/`): tests for the versioned key-value context. - - :package:`tezos-store` + - :package-api:`tezos-store ` (in directory :src:`src/lib_store/unix/test/`): tests for the on-disk store. - :package:`tezos-protocol-alpha` diff --git a/dune-project b/dune-project index d961f8d41f656acdb46f05e16193468b61f0cb3e..83cfbf5b396528fdbdc4ebe949eaef013014761e 100644 --- a/dune-project +++ b/dune-project @@ -25,13 +25,16 @@ (package (name octez-evm-proxy-lib-prod)(allow_empty)) (package (name octez-evm-proxy-tests)(allow_empty)) (package (name octez-injector)) +(package (name octez-l2-libs)) (package (name octez-libs)) (package (name octez-node)) (package (name octez-node-config)) +(package (name octez-proto-libs)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) +(package (name octez-shell-libs)) +(package (name octez-shell-tests)(allow_empty)) (package (name octez-signer)) -(package (name octez-smart-rollup)) (package (name octez-smart-rollup-client-Proxford)) (package (name octez-smart-rollup-client-PtNairob)) (package (name octez-smart-rollup-client-alpha)) @@ -42,12 +45,10 @@ (package (name octez-smart-rollup-node-lib)) (package (name octez-smart-rollup-sequencer)(allow_empty)) (package (name octez-smart-rollup-sequencer-node)) -(package (name octez-smart-rollup-wasm-benchmark)(allow_empty)) -(package (name octez-smart-rollup-wasm-benchmark-lib)(allow_empty)) (package (name octez-smart-rollup-wasm-debugger)) (package (name octez-snoop)) +(package (name octez-store-tests)(allow_empty)) (package (name octez-testnet-scenarios)) -(package (name octez-wasmer-test)(allow_empty)) (package (name octogram)) (package (name scoru-sequencer-test)(allow_empty)) (package (name tezos-017-PtNairob-test-helpers)) @@ -91,12 +92,8 @@ (package (name tezos-client-017-PtNairob)) (package (name tezos-client-018-Proxford)) (package (name tezos-client-alpha)) -(package (name tezos-client-base)) -(package (name tezos-client-base-unix)) -(package (name tezos-client-commands)) (package (name tezos-client-demo-counter)) (package (name tezos-client-genesis)) -(package (name tezos-context-ops)) (package (name tezos-dac-017-PtNairob)) (package (name tezos-dac-018-Proxford)) (package (name tezos-dac-alpha)) @@ -135,17 +132,12 @@ (package (name tezos-embedded-protocol-demo-counter)) (package (name tezos-embedded-protocol-demo-noops)) (package (name tezos-embedded-protocol-genesis)) -(package (name tezos-layer2-store)(allow_empty)) (package (name tezos-layer2-utils-016-PtMumbai)) (package (name tezos-layer2-utils-017-PtNairob)) (package (name tezos-layer2-utils-018-Proxford)) (package (name tezos-layer2-utils-alpha)) (package (name tezos-lazy-containers-tests)(allow_empty)) (package (name tezos-micheline-rewriting)) -(package (name tezos-mockup)) -(package (name tezos-mockup-commands)) -(package (name tezos-mockup-proxy)) -(package (name tezos-mockup-registration)) (package (name tezos-openapi)) (package (name tezos-protocol-000-Ps9mPmXa)) (package (name tezos-protocol-001-PtCJ7pwo)) @@ -204,22 +196,9 @@ (package (name tezos-protocol-plugin-alpha)) (package (name tezos-protocol-plugin-alpha-registerer)) (package (name tezos-protocol-plugin-alpha-tests)(allow_empty)) -(package (name tezos-protocol-updater)) -(package (name tezos-proxy)) (package (name tezos-proxy-server-config)) (package (name tezos-sc-rollup-node-test)(allow_empty)) -(package (name tezos-scoru-wasm-durable-snapshot)(allow_empty)) -(package (name tezos-scoru-wasm-fast)) -(package (name tezos-scoru-wasm-fast-test)(allow_empty)) -(package (name tezos-scoru-wasm-helpers)) (package (name tezos-scoru-wasm-regressions)(allow_empty)) -(package (name tezos-scoru-wasm-test)(allow_empty)) -(package (name tezos-scoru-wasm-test-helpers)(allow_empty)) -(package (name tezos-shell)) -(package (name tezos-shell-benchmarks)) -(package (name tezos-shell-context-test)(allow_empty)) -(package (name tezos-signer-backends)) -(package (name tezos-signer-services)) (package (name tezos-smart-rollup-016-PtMumbai)) (package (name tezos-smart-rollup-017-PtNairob)) (package (name tezos-smart-rollup-018-Proxford)) @@ -228,14 +207,11 @@ (package (name tezos-smart-rollup-layer2-017-PtNairob)) (package (name tezos-smart-rollup-layer2-018-Proxford)) (package (name tezos-smart-rollup-layer2-alpha)) -(package (name tezos-store)) (package (name tezos-tooling)) (package (name tezos-tps-evaluation)) (package (name tezos-tree-encoding-test)(allow_empty)) -(package (name tezos-validation)) (package (name tezos-version)) -(package (name tezos-wasmer)) -(package (name tezos-webassembly-interpreter-extra)) (package (name tezt-ethereum)(allow_empty)) +(package (name tezt-tezos)) ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. diff --git a/manifest/main.ml b/manifest/main.ml index 20c1d401cf5dc8b52b844386207d85c2d1a8f06c..7dd1069f77c3e3c445257a26547876a23ef4e25c 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -453,147 +453,50 @@ let alcotezt = ~deps:[tezt_core_lib] |> open_ -type sub_lib_documentation_entrypoint = Module | Page | Sub_lib - -type sub_lib = { - name : string; - synopsis : string option; - documentation_type : sub_lib_documentation_entrypoint; -} - -(* List of the registered sublibraries of octez-libs *) -let registered_octez_libs : sub_lib list ref = ref [] - -(* Registers [public_name] as a sublibrary of the [octez-libs] package. - - If [documentation] is [None] or only contains a package stanza, then the - documentation page of [octez-libs] will point to the module API of the public library. - Otherwise, it will assume that the package contains a [package_name.mld] file - and it will link to that. *) -let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs - ?documentation ?conflicts ?flags ?time_measurement_ppx ?deps ?dune ?modules - ?linkall ?js_compatible ?bisect_ppx ?preprocess ?opam_only_deps ?cram - ?release_status ?ctypes ?c_library_flags ?opam_with_test ?synopsis ~path - public_name = - let name = - let s = Option.value ~default:public_name internal_name in - String.map - (function - | '-' | '.' -> '_' - | '/' -> - invalid_arg ("octez library " ^ s ^ " name cannot contain \"/\"") - | c -> c) - s - in - let registered = - match documentation with - | None | Some Dune.[[S "package"; S "octez-libs"]] -> - (* In the case that the documentation stanza is only a package declaration, - we don't want the page to be used *) - if String.contains (Option.value ~default:public_name internal_name) '.' - then - { - name = String.capitalize_ascii name; - synopsis; - documentation_type = Sub_lib; - } - else - { - name = String.capitalize_ascii name; - synopsis; - documentation_type = Module; - } - | Some _docs -> {name; synopsis; documentation_type = Page} - in +(* Container of the registered sublibraries of [octez-libs] *) +let registered_octez_libs : Sub_lib.container = Sub_lib.make_container () - if - List.exists - (fun registered -> String.equal registered.name name) - !registered_octez_libs - then - invalid_arg - (Format.sprintf - "octez-libs already contains a library that would have the same \ - internal name, %s, as %s" - (Option.value ~default:public_name internal_name) - name) - else registered_octez_libs := registered :: !registered_octez_libs ; - public_lib - ("octez-libs." ^ public_name) - ~internal_name:name - ~opam:"octez-libs" - ~synopsis: - "A package that contains multiple base libraries used by the Octez suite" - ?opam_with_test - ?linkall - ?js_compatible - ?bisect_ppx - ?js_of_ocaml - ?inline_tests - ?foreign_stubs - ?documentation - ?conflicts - ?flags - ?time_measurement_ppx - ?deps - ?modules - ?dune - ?preprocess - ?opam_only_deps - ?cram - ?release_status - ?ctypes - ?c_library_flags - ~path - ~ocaml: - V.( - (* TODO: https://gitlab.com/tezos/tezos/-/issues/6112 - Should be in sync with scripts/version.sh *) - at_least "4.14.1" && less_than "4.15") - ~license:"Apache-2.0" - ~extra_authors:["WebAssembly Authors"] +(* Container of the registered sublibraries of [octez-shell-libs] *) +let registered_octez_shell_libs : Sub_lib.container = Sub_lib.make_container () -(* Prints all the registered octez libraries as a documentation index *) -let pp_octez_libs_index fmt registered_octez_libs = - let header = - "{0 Octez-libs: Octez libraries}\n\n\ - This is a package containing some libraries used by the Octez project.\n\n\ - It contains the following libraries:\n\n" - in - let pp_registered pp = function - | {name; synopsis = None; documentation_type = Module} -> - Format.fprintf pp "- {{!module-%s}%s}@." name name - | {name; synopsis = Some synopsis; documentation_type = Module} -> - Format.fprintf pp "- {{!module-%s}%s}: %s@." name name synopsis - | {name; synopsis = None; documentation_type = Page} -> - Format.fprintf - pp - "- {{!page-%s}%s}@." - name - (String.capitalize_ascii name) - | {name; synopsis = Some synopsis; documentation_type = Page} -> - Format.fprintf - pp - "- {{!page-%s}%s}: %s@." - name - (String.capitalize_ascii name) - synopsis - | {documentation_type = Sub_lib; _} -> - (* In case it's a sub_lib, we don't link anything *) () - in - Format.fprintf - fmt - "%s%a" - header - (Format.pp_print_list - ~pp_sep:(fun pp () -> Format.fprintf pp "") - pp_registered) - @@ List.sort - (fun {name = name1; _} {name = name2; _} -> - String.compare - (String.capitalize_ascii name1) - (String.capitalize_ascii name2)) - registered_octez_libs +(* Container of the registered sublibraries of [octez-proto-libs] *) +let registered_octez_proto_libs : Sub_lib.container = Sub_lib.make_container () + +(* Container of the registered sublibraries of [octez-l2-libs] *) +let registered_octez_l2_libs : Sub_lib.container = Sub_lib.make_container () + +(* Registers a sub-library in [octez-libs] packages. + This package should contain all Octez basic libraries. *) +let octez_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis: + "A package that contains multiple base libraries used by the Octez suite" + ~container:registered_octez_libs + ~package:"octez-libs" + +(* Registers a sub-library in the [octez-shell-libs] package. + This package should contain all the libraries related to the shell. *) +let octez_shell_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis:"Octez shell libraries" + ~container:registered_octez_shell_libs + ~package:"octez-shell-libs" + +(* Registers a sub-library in the [octez-proto-libs] package. + This package should contain all the libraries related to the protocol. *) +let octez_proto_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis:"Octez protocol libraries" + ~container:registered_octez_proto_libs + ~package:"octez-proto-libs" + +(* Registers a sub-library in the [octez-l2-libs] package. + This package should contain all the libraries related to layer 2. *) +let octez_l2_lib : Sub_lib.maker = + Sub_lib.sub_lib + ~package_synopsis:"Octez layer2 libraries" + ~container:registered_octez_l2_libs + ~package:"octez-l2-libs" let octez_test_helpers = octez_lib @@ -2117,6 +2020,12 @@ let octez_base = ~js_compatible:true ~documentation:[Dune.[S "package"; S "octez-libs"]] ~dune:Dune.[ocamllex "point_parser"] + ~ocaml: + V.( + (* TODO: https://gitlab.com/tezos/tezos/-/issues/6112 + Should be in sync with scripts/version.sh *) + at_least "4.14.1" && less_than "4.15") + ~license:"Apache-2.0" let octez_base_unix = octez_lib @@ -2257,7 +2166,7 @@ let _lazy_containers_tests = ] let octez_webassembly_interpreter = - octez_lib + octez_l2_lib "tezos-webassembly-interpreter" ~path:"src/lib_webassembly" ~dune:Dune.[[S "include_subdirs"; S "unqualified"]] @@ -2272,7 +2181,7 @@ let octez_webassembly_interpreter = ~preprocess:[pps ppx_deriving_show] let octez_webassembly_interpreter_extra = - public_lib + octez_l2_lib "tezos-webassembly-interpreter-extra" ~path:"src/lib_webassembly/extra" ~license:"Apache-2.0" @@ -2306,7 +2215,7 @@ let _octez_webassembly_test = tezt ["smallint"] ~path:"src/lib_webassembly/tests" - ~opam:"octez-libs" + ~opam:"octez-l2-libs" ~dune:Dune.[[S "include_subdirs"; S "no"]] ~deps:[octez_webassembly_interpreter |> open_; alcotezt] @@ -2433,7 +2342,7 @@ let octez_merkle_proof_encoding = ~js_compatible:true let octez_shell_services = - octez_lib + octez_shell_lib "tezos-shell-services" ~path:"src/lib_shell_services" ~synopsis:"Descriptions of RPCs exported by [tezos-shell]" @@ -2454,7 +2363,7 @@ let _octez_shell_services_tests = tezt ["test_block_services"] ~path:"src/lib_shell_services/test" - ~opam:"octez-libs" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2496,7 +2405,7 @@ let _octez_tooling_opam_lint = ~deps:[octez_tooling_opam_file_format; unix] let octez_p2p = - octez_lib + octez_shell_lib "tezos-p2p" ~path:"src/lib_p2p" ~synopsis:"Library for a pool of P2P connections" @@ -2517,16 +2426,18 @@ let octez_p2p = ] let tezt_performance_regression = - octez_lib - "tezt-performance-regression" + public_lib + "tezt-tezos.tezt-performance-regression" ~path:"tezt/lib_performance_regression" + ~opam:"tezt-tezos" ~bisect_ppx:No ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; uri; cohttp_lwt_unix] let tezt_tezos = - octez_lib + public_lib "tezt-tezos" ~path:"tezt/lib_tezos" + ~opam:"tezt-tezos" ~synopsis:"Octez test framework based on Tezt" ~bisect_ppx:No ~deps: @@ -2544,7 +2455,7 @@ let tezt_tezos = ~release_status:Released let octez_p2p_test_common = - octez_lib + octez_shell_lib "tezos_p2p_test_common" ~path:"src/lib_p2p/test/common" ~deps: @@ -2562,7 +2473,7 @@ let _octez_p2p_tezt = tezt ["test_p2p_fd"; "test_p2p_socket"; "test_p2p_conn"] ~path:"src/lib_p2p/tezt" - ~opam:"octez-libs" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2593,7 +2504,7 @@ let _octez_p2p_tests = ] ~bisect_ppx:With_sigterm ~path:"src/lib_p2p/test" - ~opam:"octez-libs" + ~opam:"octez-shell-libs" ~locks:"/locks/p2p" ~deps: [ @@ -2630,7 +2541,7 @@ let tezt_ethereum = let _tezt_self_tests = tezt ["test_michelson_script"; "test_daemon"] - ~opam:"octez-libs" + ~opam:"tezt-tezos" ~path:"tezt/self_tests" ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_] @@ -2668,7 +2579,7 @@ let _octez_gossipsub_test = ] let octez_wasmer = - public_lib + octez_l2_lib "tezos-wasmer" ~path:"src/lib_wasmer" ~synopsis:"Wasmer bindings for SCORU WASM" @@ -2694,8 +2605,7 @@ let _octez_wasmer_test = tezt ["test_wasmer"] ~path:"src/lib_wasmer/test" - ~opam:"octez-wasmer-test" - ~synopsis:"Tests for the Wasmer bindings" + ~opam:"octez-l2-libs" ~deps:[octez_wasmer; alcotezt] let octez_context_encoding = @@ -2744,7 +2654,7 @@ let octez_context_memory = ~conflicts:[Conflicts.checkseum] let octez_scoru_wasm = - octez_lib + octez_l2_lib "tezos-scoru-wasm" ~path:"src/lib_scoru_wasm" ~deps: @@ -2760,7 +2670,7 @@ let octez_scoru_wasm = ] let octez_scoru_wasm_fast = - public_lib + octez_l2_lib "tezos-scoru-wasm-fast" ~path:"src/lib_scoru_wasm/fast" ~synopsis:"WASM functionality for SCORU Fast Execution" @@ -2979,12 +2889,12 @@ let _octez_sapling_ctypes_gen = ["rustzcash_ctypes_gen"; "rustzcash_ctypes_bindings"; "gen_runtime_js"] let tezos_protocol_environment_sigs_internals = - octez_lib + octez_proto_lib "tezos-protocol-environment.sigs-internals" ~path:"src/lib_protocol_environment/sigs-internals" let tezos_protocol_environment_sigs = - octez_lib + octez_proto_lib "tezos-protocol-environment.sigs" ~path:"src/lib_protocol_environment/sigs" ~deps:[tezos_protocol_environment_sigs_internals] @@ -3015,7 +2925,7 @@ let tezos_protocol_environment_sigs = List.init (latest_environment_number + 1) gen |> Dune.of_list) let octez_protocol_environment_structs = - octez_lib + octez_proto_lib "tezos-protocol-environment.structs" ~path:"src/lib_protocol_environment/structs" ~deps: @@ -3030,9 +2940,10 @@ let octez_protocol_environment_structs = ] let octez_protocol_environment = - octez_lib + octez_proto_lib "tezos-protocol-environment" ~path:"src/lib_protocol_environment" + ~documentation:[Dune.[S "package"; S "octez-proto-libs"]] ~deps: [ zarith; @@ -3054,7 +2965,7 @@ let octez_protocol_environment = ] let octez_shell_context = - octez_lib + octez_shell_lib "tezos-shell-context" ~path:"src/lib_protocol_environment/shell_context" ~deps: @@ -3074,7 +2985,7 @@ let _octez_protocol_environment_tests = "test_data_encoding"; ] ~path:"src/lib_protocol_environment/test" - ~opam:"octez-libs" + ~opam:"octez-proto-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3087,10 +2998,10 @@ let _octez_protocol_environment_tests = ] let octez_context_ops = - public_lib + octez_shell_lib "tezos-context-ops" ~path:"src/lib_protocol_environment/context_ops" - ~synopsis:"Tezos: backend-agnostic operations on contexts" + ~synopsis:"Backend-agnostic operations on contexts" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3104,8 +3015,7 @@ let _octez_protocol_shell_context_tests = tezt ["test_proxy_context"] ~path:"src/lib_protocol_environment/test_shell_context" - ~opam:"tezos-shell-context-test" - ~synopsis:"Testing the Shell Context" + ~opam:"octez-shell-libs" ~deps: [ octez_shell_context; @@ -3181,7 +3091,7 @@ let octez_protocol_compiler_lib = ~enabled_if:[S ">="; S "%{ocaml_version}"; S "5"]; targets_rule ["embedded-interfaces-env"] - ~deps:[Dune.(H [[S "package"; S "octez-libs"]])] + ~deps:[Dune.(H [[S "package"; S "octez-proto-libs"]])] ~action: [ S "with-stdout-to"; @@ -3192,13 +3102,13 @@ let octez_protocol_compiler_lib = V [ S - "%{lib:octez-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa}"; + "%{lib:octez-proto-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa}"; ]; ]; ]; targets_rule ["embedded_cmis_env.ml"] - ~deps:[Dune.(H [[S "package"; S "octez-libs"]])] + ~deps:[Dune.(H [[S "package"; S "octez-proto-libs"]])] ~action: [ S "run"; @@ -3263,10 +3173,10 @@ let octez_protocol_compiler_native = ] let octez_protocol_updater = - public_lib + octez_shell_lib "tezos-protocol-updater" ~path:"src/lib_protocol_updater" - ~synopsis:"Tezos: economic-protocol dynamic loading for `octez-node`" + ~synopsis:"Economic-protocol dynamic loading for `octez-node`" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3283,10 +3193,10 @@ let octez_protocol_updater = ] let octez_validation = - public_lib + octez_shell_lib "tezos-validation" ~path:"src/lib_validation" - ~synopsis:"Tezos: library for block validation" + ~synopsis:"Library for block validation" ~time_measurement_ppx:true ~deps: [ @@ -3303,7 +3213,7 @@ let octez_validation = ] let octez_store_shared = - public_lib + octez_shell_lib "tezos-store.shared" ~path:"src/lib_store/shared" ~deps: @@ -3327,7 +3237,7 @@ let octez_store_shared = ] let octez_store_unix = - public_lib + octez_shell_lib "tezos-store.unix" ~path:"src/lib_store/unix" ~deps: @@ -3370,7 +3280,7 @@ let octez_store_unix = ~conflicts:[Conflicts.checkseum] let octez_store_unix_reconstruction = - public_lib + octez_shell_lib "tezos-store.unix-reconstruction" ~path:"src/lib_store/unix" ~deps: @@ -3388,7 +3298,7 @@ let octez_store_unix_reconstruction = ~modules:["reconstruction"; "reconstruction_events"] let octez_store_unix_snapshots = - public_lib + octez_shell_lib "tezos-store.unix-snapshots" ~path:"src/lib_store/unix" ~deps: @@ -3405,15 +3315,10 @@ let octez_store_unix_snapshots = ~modules:["snapshots"; "snapshots_events"] let octez_store = - public_lib + octez_shell_lib "tezos-store" ~path:"src/lib_store" - ~synopsis:"Tezos: store for `octez-node`" - ~description: - {|This library provides abstraction for storing and iterating over blocks. -tezos-store is a virtual library that provides two implementations: -- tezos-store.real is the default implementation, used in production -- tezos-store.mocked is used for testing purposes.|} + ~synopsis:"Store for `octez-node`" ~deps: [ octez_base |> open_ |> open_ ~m:"TzPervasives"; @@ -3426,18 +3331,18 @@ tezos-store is a virtual library that provides two implementations: octez_store_shared |> open_; ] ~virtual_modules:["store"] - ~default_implementation:"tezos-store.real" + ~default_implementation:"octez-shell-libs.tezos-store.real" let _octez_store_real = - public_lib + octez_shell_lib "tezos-store.real" ~path:"src/lib_store/real" ~deps:[octez_store_unix |> open_] ~implements:octez_store let _octez_store_mocked = - public_lib - "tezos-store.mocked" + octez_shell_lib + "mocked" ~path:"src/lib_store/mocked" ~deps: [ @@ -3483,13 +3388,14 @@ let _octez_requester_tests = ] let octez_shell = - public_lib + octez_shell_lib "tezos-shell" ~path:"src/lib_shell" ~synopsis: - "Tezos: core of `octez-node` (gossip, validation scheduling, mempool, \ - ...)" - ~documentation:[Dune.[S "package"; S "tezos-shell"]] + "Core of `octez-node` (gossip, validation scheduling, mempool, ...)" + ~documentation: + Dune. + [[S "package"; S "octez-shell-libs"]; [S "mld_files"; S "octez_shell"]] ~inline_tests:ppx_expect ~deps: [ @@ -3592,7 +3498,7 @@ let _octez_rpc_http_server_tests = ] let octez_client_base = - public_lib + octez_shell_lib "tezos-client-base" ~path:"src/lib_client_base" ~synopsis:"Tezos: common helpers for `tezos-client`" @@ -3625,7 +3531,7 @@ let _octez_client_base_tests = tezt ["bip39_tests"; "pbkdf_tests"] ~path:"src/lib_client_base/test" - ~opam:"tezos-client-base" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps:[octez_base; octez_client_base |> open_; alcotezt] ~js_compatible:true @@ -3635,11 +3541,11 @@ let _bip39_generator = private_exe "bip39_generator" ~path:"src/lib_client_base/gen" - ~opam:"tezos-client-base" + ~opam:"octez-shell-libs" ~bisect_ppx:No let octez_signer_services = - public_lib + octez_shell_lib "tezos-signer-services" ~path:"src/lib_signer_services" ~synopsis:"Tezos: descriptions of RPCs exported by `tezos-signer`" @@ -3653,7 +3559,7 @@ let octez_signer_services = ~js_compatible:true let octez_signer_backends = - public_lib + octez_shell_lib "tezos-signer-backends" ~path:"src/lib_signer_backends" ~synopsis:"Tezos: remote-signature backends for `tezos-client`" @@ -3673,7 +3579,7 @@ let _octez_signer_backends_tests = tezt ["test_encrypted"] ~path:"src/lib_signer_backends/test" - ~opam:"tezos-signer-backends" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -3689,7 +3595,7 @@ let _octez_signer_backends_tests = ] let octez_signer_backends_unix = - public_lib + octez_shell_lib "tezos-signer-backends.unix" ~path:"src/lib_signer_backends/unix" ~deps: @@ -3720,7 +3626,7 @@ let _octez_signer_backends_unix_tests = tezt ["test_crouching"] ~path:"src/lib_signer_backends/unix/test" - ~opam:"tezos-signer-backends" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -3733,7 +3639,7 @@ let _octez_signer_backends_unix_tests = ] let octez_client_commands = - public_lib + octez_shell_lib "tezos-client-commands" ~path:"src/lib_client_commands" ~synopsis:"Tezos: protocol agnostic commands for `tezos-client`" @@ -3755,7 +3661,7 @@ let octez_client_commands = ~linkall:true let octez_mockup_registration = - public_lib + octez_shell_lib "tezos-mockup-registration" ~path:"src/lib_mockup" ~synopsis:"Tezos: protocol registration for the mockup mode" @@ -3770,7 +3676,7 @@ let octez_mockup_registration = ~modules:["registration"; "registration_intf"; "mockup_args"] let octez_mockup_proxy = - public_lib + octez_shell_lib "tezos-mockup-proxy" ~path:"src/lib_mockup_proxy" ~synopsis:"Tezos: local RPCs" @@ -3788,7 +3694,7 @@ let octez_mockup_proxy = (* Depends on tezos_p2p to register the relevant RPCs. *) let octez_mockup = - public_lib + octez_shell_lib "tezos-mockup" ~path:"src/lib_mockup" ~synopsis:"Tezos: library of auto-documented RPCs (mockup mode)" @@ -3819,7 +3725,7 @@ let octez_mockup = ] let octez_mockup_commands = - public_lib + octez_shell_lib "tezos-mockup-commands" ~path:"src/lib_mockup" ~synopsis:"Tezos: library of auto-documented RPCs (commands)" @@ -3838,7 +3744,7 @@ let _octez_mockup_tests = tezt ["test_mockup_args"; "test_fuzzing_mockup_args"; "test_persistence"] ~path:"src/lib_mockup/test" - ~opam:"tezos-mockup" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -3854,7 +3760,7 @@ let _octez_mockup_tests = ] let octez_proxy = - public_lib + octez_shell_lib "tezos-proxy" ~path:"src/lib_proxy" ~synopsis:"Tezos: proxy" @@ -3873,7 +3779,7 @@ let octez_proxy = ] let octez_proxy_rpc = - public_lib + octez_shell_lib "tezos-proxy.rpc" ~path:"src/lib_proxy/rpc" ~deps: @@ -3909,7 +3815,7 @@ let _octez_shell_service_test_helpers_tests = tezt ["test_block_services"] ~path:"src/lib_proxy/test_helpers/shell_services/test" - ~opam:"tezos-proxy" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3932,7 +3838,7 @@ let _octez_proxy_tests = ] ~path:"src/lib_proxy/test" ~with_macos_security_framework:true - ~opam:"tezos-proxy" + ~opam:"octez-shell-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3971,7 +3877,7 @@ let _octez_proxy_server_config_tests = ] let octez_client_base_unix = - public_lib + octez_shell_lib "tezos-client-base-unix" ~path:"src/lib_client_base_unix" ~synopsis: @@ -4004,7 +3910,7 @@ let _octez_client_base_unix_tests = tezt ["test_mockup_wallet"] ~path:"src/lib_client_base_unix/test" - ~opam:"tezos-client-base-unix" + ~opam:"octez-shell-libs" ~with_macos_security_framework:true ~deps: [ @@ -4043,6 +3949,9 @@ let octez_benchmark = opam_only "hashcons" V.True; ] ~inline_tests:ppx_expect + (* We disable tests for this package as they require Python, which is not + installed in the image of the opam jobs. *) + ~opam_with_test:Never let octez_benchmark_examples = public_lib @@ -4100,7 +4009,7 @@ let octez_micheline_rewriting = ] let octez_shell_benchmarks = - public_lib + octez_shell_lib "tezos-shell-benchmarks" ~path:"src/lib_shell_benchmarks" ~synopsis:"Tezos: shell benchmarks" @@ -4211,10 +4120,9 @@ let _octez_embedded_protocol_packer = ~modules:["Main_embedded_packer"] let octez_layer2_store = - private_lib + octez_l2_lib "tezos_layer2_store" ~path:"src/lib_layer2_store" - ~opam:"tezos-layer2-store" ~synopsis:"Tezos: layer2 storage utils" ~deps: [ @@ -4234,7 +4142,7 @@ let _octez_layer2_indexed_store_test = tezt ["test_indexed_store"] ~path:"src/lib_layer2_store/test/" - ~opam:"tezos-layer2-store" + ~opam:"octez-l2-libs" ~deps: [ octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; @@ -4425,10 +4333,11 @@ let octez_injector = ] let octez_smart_rollup_lib = - public_lib + octez_l2_lib "octez-smart-rollup" ~path:"src/lib_smart_rollup" - ~synopsis:"Octez: library for Smart Rollups " + ~synopsis:"Octez: library for Smart Rollups" + ~documentation:[Dune.[S "package"; S "octez-l2-libs"]] ~deps: [ octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -4467,10 +4376,9 @@ let octez_smart_rollup_node_lib = ] let octez_scoru_wasm_helpers = - public_lib + octez_l2_lib "tezos-scoru-wasm-helpers" ~path:"src/lib_scoru_wasm/helpers" - ~opam:"tezos-scoru-wasm-helpers" ~synopsis:"Helpers for the smart rollup wasm functionality and debugger" ~deps: [ @@ -4485,10 +4393,9 @@ let octez_scoru_wasm_helpers = ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] let octez_scoru_wasm_durable_snapshot = - private_lib + octez_l2_lib "tezos_scoru_wasm_durable_snapshot" ~path:"src/lib_scoru_wasm/test/durable_snapshot" - ~opam:"tezos-scoru-wasm-durable-snapshot" ~synopsis:"Durable storage reference implementation" ~deps: [ @@ -4499,10 +4406,9 @@ let octez_scoru_wasm_durable_snapshot = ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] let octez_scoru_wasm_tests_helpers = - private_lib + octez_l2_lib "tezos_scoru_wasm_test_helpers" ~path:"src/lib_scoru_wasm/test/helpers" - ~opam:"tezos-scoru-wasm-test-helpers" ~synopsis:"Helpers for test of the smart rollup wasm functionality" ~deps: [ @@ -4523,11 +4429,10 @@ let octez_scoru_wasm_tests_helpers = ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] let octez_scoru_wasm_benchmark = - private_lib + octez_l2_lib "octez_smart_rollup_wasm_benchmark_lib" ~path:"src/lib_scoru_wasm/bench" ~synopsis:"Smart Rollup WASM benchmark library" - ~opam:"octez-smart-rollup-wasm-benchmark-lib" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -4544,8 +4449,7 @@ let _octez_scoru_wasm_benchmark_exe = private_exe "octez_smart_rollup_wasm_benchmark" ~path:"src/lib_scoru_wasm/bench/executable" - ~synopsis:"Smart rollup WASM benchmark library" - ~opam:"octez-smart-rollup-wasm-benchmark" + ~opam:"octez-l2-libs" ~preprocess:[pps ppx_deriving_show] ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_scoru_wasm_benchmark] @@ -4575,8 +4479,7 @@ let _octez_scoru_wasm_tests = "test_wasm_vm"; ] ~path:"src/lib_scoru_wasm/test" - ~opam:"tezos-scoru-wasm-test" - ~synopsis:"Tests for the scoru-wasm functionality" + ~opam:"octez-l2-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -4605,8 +4508,7 @@ let _octez_scoru_wasm_fast_tests = "test_memory_access"; ] ~path:"src/lib_scoru_wasm/fast/test" - ~opam:"tezos-scoru-wasm-fast-test" - ~synopsis:"Tests for the scoru-wasm-fast functionality" + ~opam:"octez-l2-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6913,7 +6815,7 @@ let _octez_micheline_rewriting_tests = Protocol.(client_exn alpha); ] -let _octez_store_tests = +let octez_store_tests = tezt [ "test"; @@ -6933,7 +6835,8 @@ let _octez_store_tests = ] ~path:"src/lib_store/unix/test" ~with_macos_security_framework:true - ~opam:"tezos-store" + ~opam:"octez-store-tests" + ~synopsis:"Store tests" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6969,7 +6872,7 @@ let _octez_bench_store_lib_tests_exe = octez_base |> open_ ~m:"TzPervasives"; tezt_lib; alcotezt; - _octez_store_tests |> open_; + octez_store_tests |> open_; ] (* [_octez_slow_store_lib_tests_exe] is a very long test, running a huge @@ -6990,7 +6893,7 @@ let _octez_slow_store_lib_tests_exe = octez_base |> open_ ~m:"TzPervasives"; tezt_lib; alcotezt; - _octez_store_tests |> open_; + octez_store_tests |> open_; ] let _octez_shell_tests = @@ -7015,7 +6918,8 @@ let _octez_shell_tests = ] ~path:"src/lib_shell/test" ~with_macos_security_framework:true - ~opam:"tezos-shell" + ~opam:"octez-shell-tests" + ~synopsis:"Shell tests" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -8275,9 +8179,45 @@ let () = write "script-inputs/active_protocol_versions_without_number" @@ fun fmt -> List.iter (write_protocol fmt) Protocol.active -(* Generate documentation index for Octez-libs *) +(* Generate documentation index for [octez-libs] *) let () = write "src/lib_base/index.mld" @@ fun fmt -> - pp_octez_libs_index fmt !registered_octez_libs + let header = + "{0 Octez-libs: Octez libraries}\n\n\ + This is a package containing some libraries used by the Octez project.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_libs + +(* Generate documentation index for [octez-shell-libs] *) +let () = + write "src/lib_shell/index.mld" @@ fun fmt -> + let header = + "{0 Octez-shell-libs: octez shell libraries}\n\n\ + This is a package containing some libraries used by the shell of Octez.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_shell_libs + +(* Generate documentation index for [octez-proto-libs] *) +let () = + write "src/lib_protocol_environment/index.mld" @@ fun fmt -> + let header = + "{0 Octez-proto-libs: octez protocol libraries}\n\n\ + This is a package containing some libraries related to the Tezos \ + protocol.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_proto_libs + +(* Generate documentation index for [octez-l2-libs] *) +let () = + write "src/lib_smart_rollup/index.mld" @@ fun fmt -> + let header = + "{0 Octez-l2-libs: octez layer2 libraries}\n\n\ + This is a package containing some libraries used by the layer 2 of Octez.\n\n\ + It contains the following libraries:\n\n" + in + Sub_lib.pp_documentation_of_container ~header fmt registered_octez_l2_libs let () = postcheck ~exclude () diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 9ddb6a2b2f1cbcf8047985aa1e7cbe7b0a871f81..ecefeaa09c6a429d2556026403eb4f1e4f1a2da8 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2153,6 +2153,207 @@ let add_dep_to_profile profile = function in profile_deps := String_map.add profile (dep :: old) !profile_deps +module Sub_lib = struct + type documentation_entrypoint = Module | Page | Sub_lib + + type sub_lib = { + name : string; + synopsis : string option; + documentation_type : documentation_entrypoint; + } + + type container = sub_lib list ref + + let make_container () = ref [] + + let make_documentation ~package ~public_name ~internal_name ~name ~synopsis = + function + | Some docs when not (docs = Dune.[[S "package"; S package]]) -> + {name; synopsis; documentation_type = Page} + | _ -> + (* In the case that the documentation stanza is only a package declaration, + we don't want the page to be used *) + if String.contains (Option.value ~default:public_name internal_name) '.' + then + { + name = String.capitalize_ascii name; + synopsis; + documentation_type = Sub_lib; + } + else + { + name = String.capitalize_ascii name; + synopsis; + documentation_type = Module; + } + + let pp_documentation pp = function + | {name; synopsis = None; documentation_type = Module} -> + Format.fprintf pp "- {{!module-%s}%s}@." name name + | {name; synopsis = Some synopsis; documentation_type = Module} -> + Format.fprintf pp "- {{!module-%s}%s}: %s@." name name synopsis + | {name; synopsis = None; documentation_type = Page} -> + Format.fprintf + pp + "- {{!page-%s}%s}@." + name + (String.capitalize_ascii name) + | {name; synopsis = Some synopsis; documentation_type = Page} -> + Format.fprintf + pp + "- {{!page-%s}%s}: %s@." + name + (String.capitalize_ascii name) + synopsis + | {documentation_type = Sub_lib; _} -> + (* In case it's a sub_lib, we don't link anything *) () + + (* Prints all the registered libs of a container package. *) + let pp_documentation_of_container ~header fmt registered_libs = + Format.fprintf + fmt + "%s%a" + header + (Format.pp_print_list ~pp_sep:(fun _ () -> ()) pp_documentation) + @@ List.sort + (fun {name = name1; _} {name = name2; _} -> + String.compare + (String.capitalize_ascii name1) + (String.capitalize_ascii name2)) + !registered_libs + + type maker = ?internal_name:string -> string Target.maker + + let sub_lib ~package_synopsis ~container ~package : maker = + fun ?internal_name + ?all_modules_except + ?bisect_ppx + ?c_library_flags + ?conflicts + ?deps + ?dune + ?flags + ?foreign_archives + ?foreign_stubs + ?ctypes + ?implements + ?inline_tests + ?js_compatible + ?js_of_ocaml + ?documentation + ?linkall + ?modes + ?modules + ?modules_without_implementation + ?npm_deps + ?ocaml + ?opam + ?opam_bug_reports + ?opam_doc + ?opam_homepage + ?opam_with_test + ?optional + ?preprocess + ?preprocessor_deps + ?private_modules + ?profile + ?opam_only_deps + ?release_status + ?static + ?synopsis + ?description + ?time_measurement_ppx + ?virtual_modules + ?default_implementation + ?cram + ?license + ?extra_authors + ?with_macos_security_framework + ~path + public_name -> + if Option.is_some opam then + invalid_arg "sub-libraries cannot be given custom `opam` parameters." ; + let name = + let s = Option.value ~default:public_name internal_name in + String.map + (function + | '-' | '.' -> '_' + | '/' -> + invalid_arg ("octez library " ^ s ^ " name cannot contain \"/\"") + | c -> c) + s + in + let registered = + make_documentation + ~package + ~public_name + ~internal_name + ~name + ~synopsis + documentation + in + if + List.exists + (fun registered -> String.equal registered.name name) + !container + then + invalid_arg + (Format.sprintf + "%s already contains a library that would have the same internal \ + name, %s, as %s" + package + (Option.value ~default:public_name internal_name) + name) + else container := registered :: !container ; + Target.public_lib + (package ^ "." ^ public_name) + ~path + ~internal_name:name + ~opam:package + ~synopsis:package_synopsis + ?all_modules_except + ?bisect_ppx + ?c_library_flags + ?conflicts + ?deps + ?dune + ?flags + ?foreign_archives + ?foreign_stubs + ?ctypes + ?implements + ?inline_tests + ?js_compatible + ?js_of_ocaml + ?documentation + ?linkall + ?modes + ?modules + ?modules_without_implementation + ?npm_deps + ?ocaml + ?opam_bug_reports + ?opam_doc + ?opam_homepage + ?opam_with_test + ?optional + ?preprocess + ?preprocessor_deps + ?private_modules + ?profile + ?opam_only_deps + ?release_status + ?static + ?description + ?time_measurement_ppx + ?virtual_modules + ?default_implementation + ?cram + ?license + ?extra_authors + ?with_macos_security_framework +end + (*****************************************************************************) (* GENERATOR *) (*****************************************************************************) diff --git a/manifest/manifest.mli b/manifest/manifest.mli index e91684db03a2954293e4d064c2180fb6e58bd1ed..1570e5aa75647e15ee5e8c5cbd6475ec7af8f1b6 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -1190,6 +1190,44 @@ val open_if : ?m:string -> bool -> target -> target actual package. *) val add_dep_to_profile : string -> target -> unit +(** This module is used to register multiple libraries (sub-libraries) + for a single container package. See + [https://dune.readthedocs.io/en/stable/concepts/package-spec.html#libraries] + for the corresponding dune feature. *) +module Sub_lib : sig + type documentation_entrypoint = Module | Page | Sub_lib + + type sub_lib = { + name : string; + synopsis : string option; + documentation_type : documentation_entrypoint; + } + + (** The type of a container for a set of sub-libraries *) + type container + + (** Create a container *) + val make_container : unit -> container + + (** A sub-lib [maker] is similar to a generic [maker] except that: + + - Passing a value for the [opam] parameter raises [Invalid_argument], + as all sub-libraires are necessarily restricted to a single opam + package. + + - The [internal_name] parameter can be given to set the internal name of the + library. *) + type nonrec maker = ?internal_name:string -> string maker + + (** Define a maker for sub-libraries of a given [container]. *) + val sub_lib : + package_synopsis:string -> container:container -> package:string -> maker + + (** Prints all the registered sub-libraries of a package. *) + val pp_documentation_of_container : + header:string -> Format.formatter -> container -> unit +end + (** Get a name for a given target, to display in errors. If a target has multiple names, one is chosen arbitrarily. diff --git a/opam/octez-accuser-Proxford.opam b/opam/octez-accuser-Proxford.opam index 15d5c0888643796696928a24a4c768f001c2f3f1..69d9a1eba9f7d4385f94add8985572022ce74eeb 100644 --- a/opam/octez-accuser-Proxford.opam +++ b/opam/octez-accuser-Proxford.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-018-Proxford-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam index 35b3388c81728d92f61b1a377c63f8bc0673268a..4b3eac034c0c31918aa9a8e72b0ad7ec53c48811 100644 --- a/opam/octez-accuser-PtNairob.opam +++ b/opam/octez-accuser-PtNairob.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-017-PtNairob-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 2ab6daa9abe9d7aa25ea4f04d7fb5a1d1622734a..f173068a0123e45b3c4b2f58587a6f9f18c1792b 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-alpha-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-baker-Proxford.opam b/opam/octez-baker-Proxford.opam index 40d68ed7c3c3b38ccc9edf6b4f010b233e6537e9..dca034ff1a022e606a6d50b616e3e08f7e70fd29 100644 --- a/opam/octez-baker-Proxford.opam +++ b/opam/octez-baker-Proxford.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-018-Proxford-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam index 1926b5efce242f0b353e0228df5351aa55832bf3..84a6d8c0d32643be405d29e214f4259eb3113cad 100644 --- a/opam/octez-baker-PtNairob.opam +++ b/opam/octez-baker-PtNairob.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-017-PtNairob-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index a72c8cf6bf0a0c6383d8329637a9508ae2f341a3..e35c44e60cbb848bf8618fa2024a6f657bdfd080 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -13,9 +13,8 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" - "tezos-client-commands" + "octez-shell-libs" "tezos-baking-alpha-commands" - "tezos-client-base-unix" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-client.opam b/opam/octez-client.opam index 9416cd18c5e0e17373206a00b0fe8f3cd8536b88..e8a4fcd85a7d6227b0105666df5aa7002e58517c 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -11,12 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-commands" - "tezos-mockup-commands" - "tezos-proxy" - "tezos-client-base-unix" - "tezos-signer-backends" + "octez-shell-libs" "uri" { >= "3.1.0" } "tezos-client-017-PtNairob" "tezos-baking-017-PtNairob-commands" diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 71e62e2c525b9c3542a9fe5d6eebb82504bf214c..da82900753dba57590fe8703e445a7b9e1957b19 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "data-encoding" { >= "0.7.1" & < "1.0.0" } "octez-libs" - "tezos-client-base-unix" - "tezos-client-base" - "tezos-signer-services" + "octez-shell-libs" "tezos-version" "kaitai" ] diff --git a/opam/octez-crawler.opam b/opam/octez-crawler.opam index 2e857feeec5ac57ff7b6e90c4d2a8162ae6df183..b24176a045e191d64b3bc1fd2f46a3b5696f54fa 100644 --- a/opam/octez-crawler.opam +++ b/opam/octez-crawler.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-shell" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam index 6d74583887a0fed4b48f75ef01d795d9b2ca881a..399cea91bf0febf8d1eb5103391ca995f0ab8c2d 100644 --- a/opam/octez-dac-client.opam +++ b/opam/octez-dac-client.opam @@ -11,9 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" + "octez-shell-libs" "tezos-dac-lib" "tezos-dac-client-lib" "tezos-dac-017-PtNairob" diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index a9aa92d0c749d249e4912a06b2d324e83d394c44..5d77eed9f55ce94802a1eb85764ea4d5031a2834 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "tezos-protocol-updater" + "octez-shell-libs" "tezos-dac-lib" "tezos-dac-node-lib" - "tezos-layer2-store" + "octez-l2-libs" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "tezos-dac-017-PtNairob" diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 85cd75a8010359c7d2a736d3eedf538f6c24a034..01c2ccb9be380ad19138e8a078cf1ced230696f4 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -12,14 +12,10 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "cmdliner" { >= "1.1.0" } - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "tezos-protocol-updater" + "octez-shell-libs" "tezos-dal-node-lib" "tezos-dal-node-services" - "tezos-layer2-store" - "tezos-store" + "octez-l2-libs" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "prometheus-app" { >= "1.2" } diff --git a/opam/octez-injector.opam b/opam/octez-injector.opam index 05b1a0389e65d8796c99ae6d45fdbdf0f39c5c72..9df0938b4b3ceee16182259c63b8aaee9b46bd60 100644 --- a/opam/octez-injector.opam +++ b/opam/octez-injector.opam @@ -12,8 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "logs" - "tezos-client-base" - "tezos-shell" + "octez-shell-libs" "octez-crawler" ] build: [ diff --git a/opam/tezos-layer2-store.opam b/opam/octez-l2-libs.opam similarity index 59% rename from opam/tezos-layer2-store.opam rename to opam/octez-l2-libs.opam index 419ee345eb6a99133d4d2ad19062eb751cd72589..57dca010796c6bc7f6b6ed5fc832a590af2cffbd 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/octez-l2-libs.opam @@ -2,22 +2,33 @@ # Edit file manifest/main.ml instead. opam-version: "2.0" maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] +authors: ["Tezos devteam" "WebAssembly Authors"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" +license: "Apache-2.0" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "index" { >= "1.6.0" & < "1.7.0" } + "ppx_deriving" "octez-libs" + "zarith" { >= "1.12" & < "1.13" } + "lwt" { >= "5.7.0" } + "ctypes" { >= "0.18.0" } + "ctypes-foreign" { >= "0.18.0" } + "tezos-rust-libs" { = "1.6" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "aches-lwt" { >= "1.0.0" } - "tezt" { with-test & >= "3.1.1" } - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} + "ppx_import" + "qcheck-alcotest" { >= "0.20" } + "octez-alcotezt" + "tezt" { >= "3.1.1" } +] +x-opam-monorepo-opam-provided: [ + "tezos-rust-libs" ] conflicts: [ "checkseum" { = "0.5.0" } @@ -27,4 +38,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos: layer2 storage utils" +synopsis: "Octez layer2 libraries" diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index c007b112fb02ec7fa89697c86765699a49595149..46b93615e67ea69c05bd49b985118f34a4104282 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -2,7 +2,7 @@ # Edit file manifest/main.ml instead. opam-version: "2.0" maintainer: "contact@tezos.com" -authors: ["Tezos devteam" "WebAssembly Authors"] +authors: ["Tezos devteam"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" @@ -52,12 +52,8 @@ depends: [ "mtime" { >= "1.4.0" & < "2.0.0" } "conf-libev" "uutf" - "lwt-watcher" { = "0.2" } "ringo" { >= "1.0.0" } - "prometheus" { >= "1.2" } - "tezt" { >= "3.1.1" } - "cohttp-lwt-unix" { >= "5.2.0" } - "astring" {with-test} + "tezt" { with-test & >= "3.1.1" } "qcheck-core" {with-test} "irmin" { >= "3.7.2" & < "3.8.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -66,9 +62,10 @@ depends: [ "integers_stubs_js" "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } - "class_group_vdf" { >= "0.0.4" } + "lwt-watcher" { = "0.2" } "resto-cohttp" { >= "1.2" } "resto-cohttp-client" { >= "1.2" } + "cohttp-lwt-unix" { >= "5.2.0" } "resto-cohttp-server" { >= "1.2" } "resto-acl" { >= "1.2" } "bigstring" {with-test} diff --git a/opam/octez-node-config.opam b/opam/octez-node-config.opam index aa0bd99ddbc6cf55bf476f0220257c194149d72c..a07067925ac9f95e8fe821d1a849bcebc77a10f3 100644 --- a/opam/octez-node-config.opam +++ b/opam/octez-node-config.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-store" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 8f1bd14da295df453120e46a820746c60c772b4c..6d6f0cbcd34165c65e0348a16ac9186f8f1d9f4b 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -13,10 +13,7 @@ depends: [ "octez-libs" "tezos-version" "octez-node-config" - "tezos-shell" - "tezos-store" - "tezos-validation" - "tezos-protocol-updater" + "octez-shell-libs" "cmdliner" { >= "1.1.0" } "fmt" { >= "0.8.7" } "tls-lwt" { >= "0.16.0" } diff --git a/opam/tezos-proxy.opam b/opam/octez-proto-libs.opam similarity index 78% rename from opam/tezos-proxy.opam rename to opam/octez-proto-libs.opam index 170635151a0024624702003a894868a8443956e8..df8979b82525f542226e9cc790a4b6ab9c1a5cbc 100644 --- a/opam/tezos-proxy.opam +++ b/opam/octez-proto-libs.opam @@ -10,21 +10,23 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-libs" + "octez-l2-libs" + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "bls12-381" + "zarith" { >= "1.12" & < "1.13" } + "zarith_stubs_js" + "class_group_vdf" { >= "0.0.4" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } - "octez-libs" - "tezos-client-base" - "uri" { >= "3.1.0" } - "tezos-mockup-proxy" "tezt" { with-test & >= "3.1.1" } - "qcheck-core" {with-test} - "lwt" { with-test & >= "5.7.0" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } + "lwt" { with-test & >= "5.7.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos: proxy" +synopsis: "Octez protocol libraries" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index e7ff7a873b7c2eb809ed56cbfc796eb01bfc4351..47639fa2b1a95de1b5bae7c929edca8e7a6e9ddc 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" + "octez-proto-libs" "lwt" { >= "5.7.0" } "ocp-ocamlres" { >= "0.4" } "base-unix" diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index 1bad689fb93e5db4123aca3fe09794236c1d60bc..cc6c9c617846660205394f953bc1dfe6ae35bf57 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -14,7 +14,7 @@ depends: [ "cmdliner" { >= "1.1.0" } "lwt-exit" "lwt" { >= "5.7.0" } - "tezos-proxy" + "octez-shell-libs" "tezos-proxy-server-config" "tezos-version" "uri" { >= "3.1.0" } diff --git a/opam/tezos-store.opam b/opam/octez-shell-libs.opam similarity index 57% rename from opam/tezos-store.opam rename to opam/octez-shell-libs.opam index 59c74b872283bf08c23aee516d580cd41da42235..29ce1430c19440a99278f54e4d24860760a01be1 100644 --- a/opam/tezos-store.opam +++ b/opam/octez-shell-libs.opam @@ -11,36 +11,46 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" + "lwt-watcher" { = "0.2" } + "lwt-canceler" { >= "0.3" & < "0.4" } + "ringo" { >= "1.0.0" } "aches" { >= "1.0.0" } + "prometheus" { >= "1.2" } + "tezt" { >= "3.1.1" } + "tezt-tezos" {with-test} + "octez-alcotezt" {with-test} + "astring" {with-test} + "octez-proto-libs" + "octez-protocol-compiler" + "lwt-exit" + "tezos-version" "aches-lwt" { >= "1.0.0" } - "tezos-validation" "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } - "tezos-context-ops" - "tezos-protocol-updater" - "lwt-watcher" { = "0.2" } "camlzip" { >= "1.11" & < "1.12" } "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } - "prometheus" { >= "1.2" } - "tezt" { with-test & >= "3.1.1" } - "tezos-embedded-protocol-demo-noops" {with-test} - "tezos-embedded-protocol-genesis" {with-test} - "tezos-embedded-protocol-alpha" {with-test} - "tezos-protocol-alpha" {with-test} - "tezos-protocol-plugin-alpha" {with-test} - "octez-alcotezt" {with-test} + "ppx_expect" + "uri" { >= "3.1.0" } + "ocplib-endian" + "fmt" { >= "0.8.7" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "resto-cohttp-self-serving-client" { >= "1.2" } + "tezos-benchmark" + "qcheck-alcotest" { with-test & >= "0.20" } + "qcheck-core" {with-test} + "lwt" { with-test & >= "5.7.0" } +] +depopts: [ + "ledgerwallet-tezos" ] conflicts: [ "checkseum" { = "0.5.0" } + "ledgerwallet-tezos" { < "0.3.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tezos: store for `octez-node`" -description: "This library provides abstraction for storing and iterating over blocks. -tezos-store is a virtual library that provides two implementations: -- tezos-store.real is the default implementation, used in production -- tezos-store.mocked is used for testing purposes." +synopsis: "Octez shell libraries" diff --git a/opam/tezos-shell-context-test.opam b/opam/octez-shell-tests.opam similarity index 81% rename from opam/tezos-shell-context-test.opam rename to opam/octez-shell-tests.opam index 05cbe6bd88fb463dbd71031f0ed09deb113ae643..a6bad8f45540aab4e92491c10da0ee20069dbaf8 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/octez-shell-tests.opam @@ -12,11 +12,14 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} + "octez-shell-libs" {with-test} + "tezos-embedded-protocol-demo-noops" {with-test} "octez-alcotezt" {with-test} + "tezos-version" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Testing the Shell Context" +synopsis: "Shell tests" diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index 7276f2211dd47bd54e4367ef91258e37f11402da..5c241a7966228b6a216855727dbf2db159ad5a42 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -11,11 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "tezos-signer-services" - "tezos-signer-backends" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam index f8e80071df13a8513047ffaad8a73c2128175688..75a82d02d66ca1ef8b0cf69de6c9790bfb0e3ffb 100644 --- a/opam/octez-smart-rollup-client-Proxford.opam +++ b/opam/octez-smart-rollup-client-Proxford.opam @@ -12,11 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-018-Proxford" - "tezos-client-commands" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-018-Proxford" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-018-Proxford" "tezos-smart-rollup-layer2-018-Proxford" "tezos-version" diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index 1de22e4f4889cf93aeb833bbcac0bd56c6741aa2..663882fbfca2d9933948eb409ac031c9dc0a9d29 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -12,11 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-client-commands" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-017-PtNairob" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-017-PtNairob" "tezos-smart-rollup-layer2-017-PtNairob" "tezos-version" diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index 8f57380aff34fde86a5ab167b7aee1dcdfb80fd4..2435ef1a0809fd7f54b19338cf9ccc4b5bc051b1 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -12,11 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-alpha" - "tezos-client-commands" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-alpha" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-alpha" "tezos-smart-rollup-layer2-alpha" "tezos-version" diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam index 5badc529bcdb5e9c351d56f4227d8e602a9f61f7..788e9d17bc85a1f221f812c376c06c037add59f2 100644 --- a/opam/octez-smart-rollup-node-Proxford.opam +++ b/opam/octez-smart-rollup-node-Proxford.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-018-Proxford" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" @@ -21,11 +20,10 @@ depends: [ "tezos-dac-018-Proxford" "tezos-dac-lib" "tezos-dac-client-lib" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-018-Proxford" "tezos-smart-rollup-layer2-018-Proxford" "tezos-layer2-utils-018-Proxford" - "tezos-layer2-store" "octez-crawler" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -34,9 +32,7 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm-fast" "tezos-version" - "tezos-client-commands" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index d53b4c4c1bf8abb60342a324c6c0e96085bc5bb1..001808105177df948fcdfe02f17b3b7689ec31d3 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -11,19 +11,17 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-017-PtNairob" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" "tezos-dal-node-services" "tezos-dal-node-lib" "tezos-dac-lib" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-017-PtNairob" "tezos-smart-rollup-layer2-017-PtNairob" "tezos-layer2-utils-017-PtNairob" - "tezos-layer2-store" "octez-crawler" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -32,9 +30,7 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm-fast" "tezos-version" - "tezos-client-commands" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index ceccf5bc7a91ddf93ed0d59b3c6185e8b648bc6d..5ed5a52907fd394b034f4ef116ee02d2d3b7bf80 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-client-alpha" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" @@ -21,11 +20,10 @@ depends: [ "tezos-dac-alpha" "tezos-dac-lib" "tezos-dac-client-lib" - "octez-smart-rollup" + "octez-l2-libs" "tezos-smart-rollup-alpha" "tezos-smart-rollup-layer2-alpha" "tezos-layer2-utils-alpha" - "tezos-layer2-store" "octez-crawler" "data-encoding" { >= "0.7.1" & < "1.0.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } @@ -34,9 +32,7 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm-fast" "tezos-version" - "tezos-client-commands" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-lib.opam b/opam/octez-smart-rollup-node-lib.opam index 6cd0d47ac685c09581aad2a57f97f392b7deb37d..9a263935f284a25355c89a6ec00b77f606243e75 100644 --- a/opam/octez-smart-rollup-node-lib.opam +++ b/opam/octez-smart-rollup-node-lib.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "cohttp-lwt-unix" { >= "5.2.0" } "octez-node-config" "prometheus-app" { >= "1.2" } @@ -21,9 +20,8 @@ depends: [ "tezos-dac-client-lib" "octez-injector" "tezos-version" - "tezos-layer2-store" + "octez-l2-libs" "octez-crawler" - "octez-smart-rollup" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam index 3f1c2a66c690e6f35217408a4cdc7f81b2a4ac9c..a3a4bf314eb9ad37a391cd159839cf750e29490e 100644 --- a/opam/octez-smart-rollup-node.opam +++ b/opam/octez-smart-rollup-node.opam @@ -11,10 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" - "octez-smart-rollup" + "octez-shell-libs" + "octez-l2-libs" "octez-smart-rollup-node-lib" "octez-smart-rollup-node-PtNairob" "octez-smart-rollup-node-Proxford" diff --git a/opam/octez-smart-rollup-sequencer-node.opam b/opam/octez-smart-rollup-sequencer-node.opam index 087fe6c3a87b277a7940a07c03c35d644a7c9a09..3c5ca005d43ac9134d1e7ff1c7c938b9aa2b38a2 100644 --- a/opam/octez-smart-rollup-sequencer-node.opam +++ b/opam/octez-smart-rollup-sequencer-node.opam @@ -11,9 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-client-commands" + "octez-shell-libs" "octez-smart-rollup-node-lib" "tezos-client-alpha" "octez-smart-rollup-node-alpha" diff --git a/opam/octez-smart-rollup-sequencer.opam b/opam/octez-smart-rollup-sequencer.opam index 176ad82535e24bf56e721c5f9c94650d43f8d35a..5ff3fafc113c5ab2055e914a68eb5ac6ffd826e9 100644 --- a/opam/octez-smart-rollup-sequencer.opam +++ b/opam/octez-smart-rollup-sequencer.opam @@ -15,8 +15,8 @@ depends: [ "tezos-protocol-alpha" "octez-smart-rollup-node-alpha" "octez-smart-rollup-node-lib" - "octez-smart-rollup" - "tezos-client-base" + "octez-l2-libs" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-wasm-benchmark.opam b/opam/octez-smart-rollup-wasm-benchmark.opam deleted file mode 100644 index d1dbcad705dbd9454a40afa7cef1028c96a65313..0000000000000000000000000000000000000000 --- a/opam/octez-smart-rollup-wasm-benchmark.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_deriving" - "octez-libs" - "octez-smart-rollup-wasm-benchmark-lib" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Smart rollup WASM benchmark library" diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index 8a1aab19137882976c41284a75802db41ca35ecb..3dce96c0f7da5a64ec0beb978837945de2353f43 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -13,8 +13,7 @@ depends: [ "octez-libs" "yaml" { >= "3.1.0" } "tezos-client-alpha" - "tezos-scoru-wasm-helpers" - "tezos-webassembly-interpreter-extra" + "octez-l2-libs" "tezos-version" ] build: [ diff --git a/opam/octez-smart-rollup.opam b/opam/octez-smart-rollup.opam deleted file mode 100644 index 5742940456cd4e4c98debe877a0c596dbebed068..0000000000000000000000000000000000000000 --- a/opam/octez-smart-rollup.opam +++ /dev/null @@ -1,20 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Octez: library for Smart Rollups " diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index e0d4517c5b3fa546ee702bbdb8ce5af3aba86dc9..d6f5e2fba0e68bafd94416a9237fa1dd4529a0ea 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-benchmark" "tezos-benchmark-examples" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-benchmarks-proto-alpha" "pyml" "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/octez-store-tests.opam similarity index 68% rename from opam/tezos-scoru-wasm-fast-test.opam rename to opam/octez-store-tests.opam index f714b1abb974778bc5cb2b96d5d7fda9c29140b1..20a9588fa5e5024927a57fb029a16cbff87ba00f 100644 --- a/opam/tezos-scoru-wasm-fast-test.opam +++ b/opam/octez-store-tests.opam @@ -10,14 +10,14 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "ppx_import" {with-test} - "ppx_deriving" {with-test} "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm-test-helpers" {with-test} - "tezos-scoru-wasm-fast" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } + "octez-shell-libs" {with-test} + "tezos-embedded-protocol-demo-noops" {with-test} + "tezos-embedded-protocol-genesis" {with-test} + "tezos-embedded-protocol-alpha" {with-test} + "tezos-protocol-alpha" {with-test} + "tezos-protocol-plugin-alpha" {with-test} "octez-alcotezt" {with-test} ] build: [ @@ -25,4 +25,4 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Tests for the scoru-wasm-fast functionality" +synopsis: "Store tests" diff --git a/opam/octez-testnet-scenarios.opam b/opam/octez-testnet-scenarios.opam index 9a97127b895e193aef4641d0560698654ec828ea..70468206737052b0dbf4a269a7bf53ced81820da 100644 --- a/opam/octez-testnet-scenarios.opam +++ b/opam/octez-testnet-scenarios.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "octez-libs" + "tezt-tezos" "tezt-ethereum" ] build: [ diff --git a/opam/octez-wasmer-test.opam b/opam/octez-wasmer-test.opam deleted file mode 100644 index 72df2c94421b658e96d6dcebd9e413aedb9c9cad..0000000000000000000000000000000000000000 --- a/opam/octez-wasmer-test.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "tezt" { with-test & >= "3.1.1" } - "tezos-wasmer" {with-test} - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tests for the Wasmer bindings" diff --git a/opam/octogram.opam b/opam/octogram.opam index 7dbd9a763f87f068a02cdfb2774b48fd568ba950..db39e40f04eb50b96f05b495f79f260f31725362 100644 --- a/opam/octogram.opam +++ b/opam/octogram.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "octez-libs" + "tezt-tezos" "jingoo" "dmap" "yaml" { >= "3.1.0" } diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam index 1c0dc011b687c5c704b7c62a9a71ecb8d56f1291..fbdfd3046e346cf8c94406d32fc4bf240308a0bc 100644 --- a/opam/tezos-017-PtNairob-test-helpers.opam +++ b/opam/tezos-017-PtNairob-test-helpers.opam @@ -14,7 +14,9 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" + "octez-proto-libs" "tezos-protocol-plugin-017-PtNairob" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-018-Proxford-test-helpers.opam b/opam/tezos-018-Proxford-test-helpers.opam index 4466d5d2adbac773049f4d346831ff5af03f8f32..f5cef06ca8a0026c44d866a54e0340169640617b 100644 --- a/opam/tezos-018-Proxford-test-helpers.opam +++ b/opam/tezos-018-Proxford-test-helpers.opam @@ -14,7 +14,9 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" + "octez-proto-libs" "tezos-protocol-plugin-018-Proxford" + "octez-shell-libs" "tezos-smart-rollup-018-Proxford" ] build: [ diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 50d55b2c8674e11f703ae87f5b9ccf770fc0bd59..2b020742d02c9a9e7d7c2127b7610690e0a0a9db 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -14,7 +14,9 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" + "octez-proto-libs" "tezos-protocol-plugin-alpha" + "octez-shell-libs" "tezos-smart-rollup-alpha" ] build: [ diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam index 393bb6ebbc3d1078e2199e197cc8b4d1eec54480..e342ad58e5078587aaa57d8ddb76ec105113af9b 100644 --- a/opam/tezos-baking-017-PtNairob-commands.opam +++ b/opam/tezos-baking-017-PtNairob-commands.opam @@ -12,9 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-client-base" + "octez-proto-libs" + "octez-shell-libs" "tezos-client-017-PtNairob" - "tezos-client-commands" "tezos-baking-017-PtNairob" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index 54cce7f24fd7bbc3dd9c4c72c074d34bd4833ebd..e6f42be8529f01b47e963bd7bfb4e3ff581c4347 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -14,19 +14,14 @@ depends: [ "tezos-version" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-client-base" + "octez-proto-libs" + "octez-shell-libs" "tezos-client-017-PtNairob" - "tezos-client-commands" - "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-client-base-unix" - "tezos-mockup" - "tezos-mockup-proxy" - "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-baking-018-Proxford-commands.opam b/opam/tezos-baking-018-Proxford-commands.opam index 05aa41bcb1a0b266880fdc590fb78ddc9c638924..dee22181e02b13b6b2def4eebc015078a58c7860 100644 --- a/opam/tezos-baking-018-Proxford-commands.opam +++ b/opam/tezos-baking-018-Proxford-commands.opam @@ -12,9 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-018-Proxford" - "tezos-client-base" + "octez-proto-libs" + "octez-shell-libs" "tezos-client-018-Proxford" - "tezos-client-commands" "tezos-baking-018-Proxford" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-baking-018-Proxford.opam b/opam/tezos-baking-018-Proxford.opam index d5d71f06cc1005f92175ba1d012d8508da534147..85dbb2f6e4d4e3cc66339a3ff0cf883ba141fe42 100644 --- a/opam/tezos-baking-018-Proxford.opam +++ b/opam/tezos-baking-018-Proxford.opam @@ -14,19 +14,14 @@ depends: [ "tezos-version" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-client-base" + "octez-proto-libs" + "octez-shell-libs" "tezos-client-018-Proxford" - "tezos-client-commands" - "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-client-base-unix" - "tezos-mockup" - "tezos-mockup-proxy" - "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index 85dd1b3358060344befb0ba0644905f83bef25c9..5d068aa1b8aff988fb01540a7b2a0a4def7f8bf6 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -12,9 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-alpha" - "tezos-client-base" + "octez-proto-libs" + "octez-shell-libs" "tezos-client-alpha" - "tezos-client-commands" "tezos-baking-alpha" "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 1f9cda0f66a7cef9d1b461fc9fa9d5a65d61bd49..7eec4c8750b1a8d17050b2a8fe2a54ecddf15281 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -14,19 +14,14 @@ depends: [ "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-client-base" + "octez-proto-libs" + "octez-shell-libs" "tezos-client-alpha" - "tezos-client-commands" - "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "uri" { >= "3.1.0" } "data-encoding" { >= "0.7.1" & < "1.0.0" } - "tezos-client-base-unix" - "tezos-mockup" - "tezos-mockup-proxy" - "tezos-mockup-commands" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index 747f63bc6e4d27968828eb4b990a5aa96ba78f36..1bcb876e3c7e0a080f07fd064cd0f17134425da5 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -21,9 +21,5 @@ depends: [ "ocaml-migrate-parsetree" "hashcons" ] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] +build: [["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs]] synopsis: "Tezos: library for writing benchmarks and performing simple parameter inference" diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam index cfd6fa020449a1d9e5b265c46c676861409f008d..8d4b8cd1c08b84ff8b081b61ffee63f6fab3eefe 100644 --- a/opam/tezos-benchmarks-proto-017-PtNairob.opam +++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam @@ -15,10 +15,11 @@ depends: [ "tezos-benchmark" "tezos-benchmark-017-PtNairob" "tezos-benchmark-type-inference-017-PtNairob" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-017-PtNairob-test-helpers" "tezos-client-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-benchmarks-proto-018-Proxford.opam b/opam/tezos-benchmarks-proto-018-Proxford.opam index 77051822a6a439b5554d4701e5ece8719fb1a015..61c10ab40b5880ee013b2d5535976e9b949e8bc3 100644 --- a/opam/tezos-benchmarks-proto-018-Proxford.opam +++ b/opam/tezos-benchmarks-proto-018-Proxford.opam @@ -15,10 +15,11 @@ depends: [ "tezos-benchmark" "tezos-benchmark-018-Proxford" "tezos-benchmark-type-inference-018-Proxford" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-018-Proxford-test-helpers" "tezos-client-018-Proxford" "tezos-protocol-plugin-018-Proxford" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index 8426e139996bb4a054364c257e27f0a0c74b9653..d76e5d4a095d43398d33b14e4bb39fadfaab8a91 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -15,10 +15,11 @@ depends: [ "tezos-benchmark" "tezos-benchmark-alpha" "tezos-benchmark-type-inference-alpha" - "tezos-shell-benchmarks" + "octez-shell-libs" "tezos-alpha-test-helpers" "tezos-client-alpha" "tezos-protocol-plugin-alpha" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 971803d0843ffa5d881e68a8c611739dc3127d78..34478b731426fd50cfc75c3221ec2cd51e608f0e 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-000-Ps9mPmXa" - "tezos-client-commands" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index aba7880bd13ce59ebf2245159e1ce635bfab5402..a7675bae5b8e40720e21c8a739ea39c955767316 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -11,11 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-001-PtCJ7pwo" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index a74eb816f4786be75838df786f892e0c8723456f..4f14ba8cc848409025eca361ed3f4e711b6a0ebe 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -11,11 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-002-PsYLVpVv" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 791066ab4b3db4502a28c252823a692e1491b02c..5a536db3982e0a429ceb549bb03c2053fc6eda4b 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -11,11 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-003-PsddFKi3" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 0e7e81c486e3299a157c5057cdfbf2fb23b7a197..1095d164b45859452b6f128d18e9c421cbf12920 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -11,11 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-004-Pt24m4xi" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 6045bdba4b884c3041e7070b65de7841845de086..f2a4db2f2b9d44f5ea2324cee76cdd0ee578bf5a 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -11,11 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-005-PsBabyM1" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index f322c3d8d98ddd51fe32a17a8e934d0d2a0b5268..7888a8cc34d77de0373c599041007643078aece6 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -11,11 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-006-PsCARTHA" - "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index 756f628268fe0c40dbe465f9ed60e9f8897faf61..10e34130c530b198d5709952f869f99499329f28 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -11,12 +11,11 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-007-PsDELPH1" - "tezos-signer-backends" "tezos-protocol-plugin-007-PsDELPH1" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 37a649232cda9729e1692f743ac5192db0d88164..8f13c37f06d2dee7a3deda1e5b9459808fe7c1af 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -11,12 +11,11 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-008-PtEdo2Zk" - "tezos-signer-backends" "tezos-protocol-plugin-008-PtEdo2Zk" "uri" { >= "3.1.0" } - "tezos-client-commands" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 06781b88a5aeac6f0ac9187b572f4e7844d9bbbd..1df8299d1c5fb2ba03be262c5f427f1a65be292c 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -12,13 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-009-PsFLoren" - "tezos-signer-backends" "tezos-protocol-plugin-009-PsFLoren" "uri" { >= "3.1.0" } - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 61bcb9a8abb0eabf9c33008e9d7b71c222528a64..32026eee23eb2fe8502ffa28b9fdaf20986a2d75 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -12,13 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-010-PtGRANAD" - "tezos-signer-backends" "tezos-protocol-plugin-010-PtGRANAD" "uri" { >= "3.1.0" } - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index 292bd68e564c687329fa9412c513c05212169c5c..55234da1761090bc41b6dfbed108d6548a7a7cee 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -12,17 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-011-PtHangz2" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-011-PtHangz2" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index d45d2fc33ddc1f89a90cb57a2b30dd3e216ae09f..8518be735a5fd2ecabbc33b7629d5faa9c215919 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -12,17 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-012-Psithaca" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-012-Psithaca" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index 59c6912fc9811c1dfcca0019b432b63cddf949c1..3b5ab7cfef4df33b5a39060458520bce01fdb9ac 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -12,17 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-013-PtJakart" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-013-PtJakart" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 922210220b2d7b94875fbb49d1539c643d0383f2..7ec32415f93b239dc0f083704e44d8e957120763 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -12,17 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-014-PtKathma" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-014-PtKathma" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index e34a3b3a673442502f6728edad0cc7892a588d0e..b8be855704f19b01d3acf9e326b3748f2d6b2472 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -12,17 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-015-PtLimaPt" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-015-PtLimaPt" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index 010a18f5d99eb884a3ff448ad9f4aee73f3b1406..f59659e4d14cfe5ed11ee45cf1dec5e63eac017c 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -12,18 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-016-PtMumbai" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-016-PtMumbai" "tezos-smart-rollup-016-PtMumbai" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index 2327afcd7386e710345278ead4de81d76ee3434f..a35c459577dcdd82eb6942db750cb7f6af3689a1 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -12,18 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-017-PtNairob" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-017-PtNairob" "tezos-smart-rollup-017-PtNairob" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-018-Proxford.opam b/opam/tezos-client-018-Proxford.opam index c17f227954939014af301fc4f1f5dc4dd0a9b1e8..7e68da963275501ad17229f1af52fe4a4908165c 100644 --- a/opam/tezos-client-018-Proxford.opam +++ b/opam/tezos-client-018-Proxford.opam @@ -12,18 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-018-Proxford" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-018-Proxford" "tezos-smart-rollup-018-Proxford" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 76ea94db48893074b0d1c8a565213f988133a3d8..48991ce7e6aa74302fbb84ffef17367aa8df1e9d 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -12,18 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-client-base" + "octez-shell-libs" "tezos-protocol-alpha" - "tezos-mockup-registration" - "tezos-proxy" - "tezos-signer-backends" "tezos-protocol-plugin-alpha" "tezos-smart-rollup-alpha" "uri" { >= "3.1.0" } - "tezos-mockup" - "tezos-mockup-commands" - "tezos-client-commands" - "tezos-client-base-unix" + "octez-proto-libs" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam deleted file mode 100644 index 99557f41d36ed5ca3be85ebfe1094b26865bca66..0000000000000000000000000000000000000000 --- a/opam/tezos-client-base-unix.opam +++ /dev/null @@ -1,32 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-client-commands" - "tezos-mockup" - "tezos-mockup-registration" - "tezos-mockup-commands" - "tezos-proxy" - "tezos-signer-backends" - "tezos-version" - "lwt-exit" - "uri" { >= "3.1.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: common helpers for `tezos-client` (unix-specific fragment)" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam deleted file mode 100644 index 18188b9110bde48face892ffcdbd4c2f5245bb58..0000000000000000000000000000000000000000 --- a/opam/tezos-client-base.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "uri" { >= "3.1.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: common helpers for `tezos-client`" diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam deleted file mode 100644 index 86d3d868cc838af52aa01fc4f5a13d26958dfaa5..0000000000000000000000000000000000000000 --- a/opam/tezos-client-commands.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-signer-backends" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "uri" { >= "3.1.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: protocol agnostic commands for `tezos-client`" diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam index c2733981d91e025968bf8a5c9e41d61e79e00355..4cc19d42483bdc2183b89b63270f0b75490a7e8d 100644 --- a/opam/tezos-client-demo-counter.opam +++ b/opam/tezos-client-demo-counter.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-commands" + "octez-shell-libs" "tezos-protocol-demo-counter" ] build: [ diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 5f34bc3935b9e4909e8f304e096f9cdfaec76330..e265dac00e0c10314bb2dc4e5b071ae0dad45a7a 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -11,10 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" + "octez-shell-libs" + "octez-proto-libs" "tezos-protocol-genesis" - "tezos-client-commands" - "tezos-proxy" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam deleted file mode 100644 index 8ba3e0a60b8d0963679fee1b2cb5f4b57ded6bcb..0000000000000000000000000000000000000000 --- a/opam/tezos-context-ops.opam +++ /dev/null @@ -1,20 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: backend-agnostic operations on contexts" diff --git a/opam/tezos-dac-client-lib.opam b/opam/tezos-dac-client-lib.opam index 19bfae7b176e9e1b88636a0ee696fb8a26c2ee87..1f80b79da05223a18b7ec23e40a7970112dbaf67 100644 --- a/opam/tezos-dac-client-lib.opam +++ b/opam/tezos-dac-client-lib.opam @@ -11,8 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-dac-lib" ] build: [ diff --git a/opam/tezos-dac-lib.opam b/opam/tezos-dac-lib.opam index 9bf97a3ea184678784c67658ce0983aa74e3a340..efb7f26278f23eedbf74f7a87f5b4e400aa7f4a0 100644 --- a/opam/tezos-dac-lib.opam +++ b/opam/tezos-dac-lib.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-protocol-updater" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index 741c92f5aa99acba0f3242a033e09de29db93810..c48ff187dc51742a0f2d576b3c1b18118e098e1e 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -11,9 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-client-base" - "tezos-client-base-unix" - "tezos-layer2-store" + "octez-shell-libs" + "octez-l2-libs" "tezos-dac-lib" "tezos-dac-client-lib" ] diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index 02ccc086761a300200757e7561ebef08d539785a..c2be99ccb817270d4906ab505435cd1e4d69240e 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -12,9 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-dal-node-services" - "tezos-client-base" - "tezos-protocol-updater" - "tezos-client-base-unix" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index d56ec153d2d79b4b1f23f14f1249929f9050ddac..5e55635f9a5e8ecbbb9703296aaa5e1ac0372f3f 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-000-Ps9mPmXa" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index c06db423741ed09cd74b7f660e85888a4688190b..c536aa989120a2cedc4201ac54add3c1953cdee2 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-001-PtCJ7pwo" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 2a6bf0ded8bfbf49cfa28431cd968704657b4a44..c902f863e473d9c028e581d2922b46aa1c8f5d1a 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-002-PsYLVpVv" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 4dbfda0ba4d761259516ea8f3377a0087eed45e8..35b65e459665274806fe0a1c7a6f465928e224de 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-003-PsddFKi3" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index 02cb3d58953c2ebf8bfe12f8f5b5646ebac528dc..13002ff70bfc65787164423cbf3551ba390a267f 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-004-Pt24m4xi" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index bbc267f77182a3f9ab760dd21540af0c02bc0d77..6680e5a2cb45cce8c1375261d46674b2685bbe47 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-005-PsBABY5H" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index 6e69a417f5583c18d03171e79040cc7074f3da85..c2557895d99e9f9791e69c20e5012f46284f5cf0 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-005-PsBabyM1" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index b0b70e35e607fbae5f00cbd1b566c8512c1fbc46..126de3ccbf9979f5480731c8420ffd002bfa6d7b 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-006-PsCARTHA" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index 7343d0f8d749e8cb8b1d30bbb7f59135fb2b735d..754ad53a8c777d2f5cabeef913a7ff459f11c8e9 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-007-PsDELPH1" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index 220da24c3c3bbf769258b3e29d809a83aab9b553..7d55b520222a2b32953a27233a97b3a1b502c86f 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdo2Zk" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index a7c9871e60977f2c7cdb263a213952e5eb8c13ce..08730b5499abaeeffae6cce1fbc6e78d37f45c87 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdoTez" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index e215b0a269686c4d2aff3d7db2b454a3a125fc68..a910a6d56dcf9ff85924d3721bd1f5d110eeb683 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-009-PsFLoren" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index c46a44e254f91a324cc224f0a35f5ae668e165f7..6522e393a051348ee54ba01d82a0e8d34d551565 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-010-PtGRANAD" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index e52733a6beac041653496eca7646c3157c641a5e..7fbc44f8c405d6c73825fdf5d8fef19e2759aef2 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-011-PtHangz2" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index ebdea67427abe2448af9b4dc20c433d4b987ad66..9dcc11d3befed6bc2faf8b3f3489c6e299b96670 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-012-Psithaca" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index 5df1a4ebf7a7baa0514e11cffd175d96e85331c4..66d8f2a5a8815c73299a01bd66546bc367e7ce2e 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-013-PtJakart" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam index 95141cf85d3c44d820ba106eb6b1c6cd3489454d..09138c0f0b66a3280f6992af555b95c31c7f0a3a 100644 --- a/opam/tezos-embedded-protocol-014-PtKathma.opam +++ b/opam/tezos-embedded-protocol-014-PtKathma.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-014-PtKathma" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam index 3813e81e193efc7c098a7e1ab2f34b7231bbbce2..ed60ffe02ae6efa45db70090ef6df58e89ccc96e 100644 --- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam +++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-015-PtLimaPt" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam index 7cc9e2548853207bcc75412205d82d8b83b2a918..ab4fc88393aa92bd12fd212b16ee408870b8c6e5 100644 --- a/opam/tezos-embedded-protocol-016-PtMumbai.opam +++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-016-PtMumbai" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-017-PtNairob.opam b/opam/tezos-embedded-protocol-017-PtNairob.opam index 2521c908bd8ad8f5a2fa223fd2e1a9e7168c5ff3..1414b3e939ce0dabcbc0695d15032215bfe94a67 100644 --- a/opam/tezos-embedded-protocol-017-PtNairob.opam +++ b/opam/tezos-embedded-protocol-017-PtNairob.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-017-PtNairob" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-018-Proxford.opam b/opam/tezos-embedded-protocol-018-Proxford.opam index 542db25e7f7a1b944353a0202693fb549d2e2fc8..ef9de1c2ed127a8c1256c0621b3323474b39d532 100644 --- a/opam/tezos-embedded-protocol-018-Proxford.opam +++ b/opam/tezos-embedded-protocol-018-Proxford.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-018-Proxford" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index b6192c933feef9b90f791b2db4d51d0710304d63..4a45e0c9714cba81573b368633efd20c7417b458 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-alpha" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index 71b5f72c9a072386b41354e08b83d3cb10140c57..c77d036da4c05c3a2aa2a6b8b4f3bee996dc5f4f 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-demo-counter" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index 26b6f04e122484b8693e1850dda940742bca1054..79e0d5aaa631a1b347a5fa3ba5df01414c330cc7 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-demo-noops" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index 94ef78323d2357b950d6458d8cf0805f8c902215..6f0dd91ec31b102c7263838c412dc2d3db3a789e 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezos-protocol-genesis" - "tezos-protocol-updater" - "octez-libs" + "octez-shell-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam deleted file mode 100644 index bd1379292c6d39a81c40aaaf0f1f0f96cb8d551a..0000000000000000000000000000000000000000 --- a/opam/tezos-mockup-commands.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-commands" - "tezos-client-base" - "tezos-mockup" - "tezos-mockup-registration" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library of auto-documented RPCs (commands)" diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam deleted file mode 100644 index b2a1f730cd50fa531de8fbffc7d1023c74835e46..0000000000000000000000000000000000000000 --- a/opam/tezos-mockup-proxy.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "resto-cohttp-self-serving-client" { >= "1.2" } - "uri" { >= "3.1.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: local RPCs" diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam deleted file mode 100644 index b4af0cfd77af6320ae0d7b65849f52969ff16bd0..0000000000000000000000000000000000000000 --- a/opam/tezos-mockup-registration.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "uri" { >= "3.1.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: protocol registration for the mockup mode" diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam deleted file mode 100644 index 7b927a4a6dbc60a7a8dcd5f48cda8b23cdeb5543..0000000000000000000000000000000000000000 --- a/opam/tezos-mockup.opam +++ /dev/null @@ -1,27 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-mockup-proxy" - "resto-cohttp-self-serving-client" { >= "1.2" } - "tezos-mockup-registration" - "tezt" { with-test & >= "3.1.1" } - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library of auto-documented RPCs (mockup mode)" diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam index 6508d19384d0d86d4f75fe205b25af41341371f4..641757dccd9f3f7297c148fd19067382db192457 100644 --- a/opam/tezos-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-protocol-000-Ps9mPmXa.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam index e9b75c8768ecf92921367bcf7f8694491082b3d6..a5e329cc4df37efc5e5714585830b504e07ad8ee 100644 --- a/opam/tezos-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-protocol-001-PtCJ7pwo.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam index 9f358ea2cae2be0de8200aebb227b4930305a630..082c793e2386ec2a57685523f924ea222388236a 100644 --- a/opam/tezos-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-protocol-002-PsYLVpVv.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam index 114213d699b709a1cbc1c85d532eca92bc96092b..86f02e1d9b9b9134ea7768de62d19173b6ef00a0 100644 --- a/opam/tezos-protocol-003-PsddFKi3.opam +++ b/opam/tezos-protocol-003-PsddFKi3.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-protocol-004-Pt24m4xi.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-005-PsBABY5H.opam +++ b/opam/tezos-protocol-005-PsBABY5H.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-005-PsBabyM1.opam +++ b/opam/tezos-protocol-005-PsBabyM1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-006-PsCARTHA.opam +++ b/opam/tezos-protocol-006-PsCARTHA.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-007-PsDELPH1.opam +++ b/opam/tezos-protocol-007-PsDELPH1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-008-PtEdoTez.opam +++ b/opam/tezos-protocol-008-PtEdoTez.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index 2d17344395399e1df76690eb24306bb1be9127ea..02a3fd6fbdd2b26a7e6b7e24a5a567515afda443 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 154bfa6a60290bf73c9b741a766edfe1d62ad11d..ca7c8e15ac7c868adffeceb3aed9a4964fb35d4f 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -22,9 +22,10 @@ depends: [ "tezos-benchmark-type-inference-017-PtNairob" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-017-PtNairob" {with-test} - "tezos-client-base" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} + "tezt-tezos" {with-test} + "octez-shell-libs" {with-test} + "octez-proto-libs" {with-test} + "octez-l2-libs" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-017-PtNairob.opam +++ b/opam/tezos-protocol-017-PtNairob.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 4cd03c42e437cb6753f8193d5479c0953cab3b07..1fdbc55ae1c2408c61941907776fc75fea2df73d 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -22,9 +22,10 @@ depends: [ "tezos-benchmark-type-inference-018-Proxford" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-018-Proxford" {with-test} - "tezos-client-base" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} + "tezt-tezos" {with-test} + "octez-shell-libs" {with-test} + "octez-proto-libs" {with-test} + "octez-l2-libs" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-018-Proxford.opam b/opam/tezos-protocol-018-Proxford.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-018-Proxford.opam +++ b/opam/tezos-protocol-018-Proxford.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 4934e611e6ee4be1f8366154f3236fb24ac03a41..5688a1232e4f558939ed311bddd176f362e775a2 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -22,9 +22,10 @@ depends: [ "tezos-benchmark-type-inference-alpha" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-smart-rollup-alpha" {with-test} - "tezos-client-base" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} + "tezt-tezos" {with-test} + "octez-shell-libs" {with-test} + "octez-proto-libs" {with-test} + "octez-l2-libs" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index 2d17344395399e1df76690eb24306bb1be9127ea..13ada1b044d8d40f1c5036a6be247afb9154752a 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } + "octez-proto-libs" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam index 573c97ff0ce6a4e154045372c0c4a6c7f1c96f13..5189adf672605ff29afeb7f49bb23dc52e3f4f61 100644 --- a/opam/tezos-protocol-demo-counter.opam +++ b/opam/tezos-protocol-demo-counter.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam index 58e072e152b98e92a86baee8e3c7ff5bb29bb53c..90ae889e15eb44219f247f6d9b5b0a216165c6bc 100644 --- a/opam/tezos-protocol-demo-noops.opam +++ b/opam/tezos-protocol-demo-noops.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam index 862fbf9c350cb51375939b97b866a413d38477a7..a7a5fc8477272f5d35275ccf3892a3b930879eba 100644 --- a/opam/tezos-protocol-genesis.opam +++ b/opam/tezos-protocol-genesis.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "octez-libs" + "octez-proto-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam index d374767e2c24dc3d3b8089f141ac3ee08ff94f75..cf70abe9cc5b08d6446b159af825377644db7cde 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-007-PsDELPH1" "tezos-protocol-plugin-007-PsDELPH1" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam index 4775a0140833422681af818910a8aaff7dcd0d58..7affbba96c989426199bd118b4ee87fcc593c7bb 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-008-PtEdo2Zk" "tezos-protocol-plugin-008-PtEdo2Zk" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam index 2b6a491bbf5fedc5940e0bd5823f3201a5e56a5f..fbd31f6a2d85483b105431aaaa1d8c2860590290 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-009-PsFLoren" "tezos-protocol-plugin-009-PsFLoren" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam index 001431abcadeec54c657a76ff77f2ee66db36fdd..5926a5e7de767b4a8f3284ac557968ae75c157f1 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-010-PtGRANAD" "tezos-protocol-plugin-010-PtGRANAD" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam index b888133b3dede1737bc4cac0feb9cca8c969cc93..209857bd3c920b226660e7a1e1c872c96d7cd232 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-011-PtHangz2" "tezos-protocol-plugin-011-PtHangz2" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam index 72598121557eea1885249b68a947c4d958efe89c..365269db3f3cf75a71bf8008ddd689f69c215f36 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam index 50e0b5397de1ceac2cf4a58652df058d16c4addc..17d7f726826642922f8961f6e28dc4e4f71df056 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam index 0b931cdb21fc73319d85bca5b9806cb16c63ab98..164d583b89a10ea285e4d5ccb8b8e9d194787a8a 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam index 1e7731c0654174e4e24390ce209eda6d9b1ae85e..d76366e9237d6ccfc0ff363a5da855674b6975e2 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-015-PtLimaPt" "tezos-protocol-plugin-015-PtLimaPt" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam index a90ee672435cb66adf82fd06512c2611987b81d2..ed31fc92d6c147dd6978bd7135bec98f59a3a8c7 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-016-PtMumbai" "tezos-protocol-plugin-016-PtMumbai" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam index fdc2d2dd02a246017ac720d34a5bf84b96aa6e59..3dec8b37c9c57c28aa5ab0e4852b779ce90c935d 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam index fad1e2e08cb9c0b3a01691f7dc22ce73dfd6c352..b94d56784b565b3872ed4a9851a389821f31f9fa 100644 --- a/opam/tezos-protocol-plugin-018-Proxford-registerer.opam +++ b/opam/tezos-protocol-plugin-018-Proxford-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam index 96098845109bbd72d23e5238f7d0676d224adec1..dcc88e2f5f24d71efa76b4db85f422b7cdb6d08c 100644 --- a/opam/tezos-protocol-plugin-alpha-registerer.opam +++ b/opam/tezos-protocol-plugin-alpha-registerer.opam @@ -13,7 +13,7 @@ depends: [ "octez-libs" "tezos-embedded-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-validation" + "octez-shell-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam deleted file mode 100644 index b92c06154cf9d765adc35c7d07559af7e231dd82..0000000000000000000000000000000000000000 --- a/opam/tezos-protocol-updater.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "octez-protocol-compiler" - "lwt-exit" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: economic-protocol dynamic loading for `octez-node`" diff --git a/opam/tezos-scoru-wasm-durable-snapshot.opam b/opam/tezos-scoru-wasm-durable-snapshot.opam deleted file mode 100644 index 28b3be58b1b720e15531a49e79281bf459e6ef2f..0000000000000000000000000000000000000000 --- a/opam/tezos-scoru-wasm-durable-snapshot.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" - "ppx_deriving" - "octez-libs" - "tezos-webassembly-interpreter-extra" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Durable storage reference implementation" diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam deleted file mode 100644 index 17d63fc0e0dd61e8a85227c66016544dd724a47f..0000000000000000000000000000000000000000 --- a/opam/tezos-scoru-wasm-fast.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-wasmer" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "WASM functionality for SCORU Fast Execution" diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam deleted file mode 100644 index 6059fdc2fd6f6017818450fb504d5e1f95583e81..0000000000000000000000000000000000000000 --- a/opam/tezos-scoru-wasm-helpers.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" - "ppx_deriving" - "octez-libs" - "tezos-scoru-wasm-fast" - "tezos-webassembly-interpreter-extra" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Helpers for the smart rollup wasm functionality and debugger" diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index e1728ce4fab76448a9609dd8f2119f762d157596..8cec8eed635d8a4c527ebfd5ce30febe9aeb11c1 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -13,7 +13,7 @@ depends: [ "ppx_import" "ppx_deriving" "octez-libs" - "tezos-scoru-wasm-helpers" + "octez-l2-libs" "tezos-protocol-alpha" "tezos-smart-rollup-alpha" "tezt" { >= "3.1.1" } diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam deleted file mode 100644 index 998ad2c413d79c4005ce8067346fd1a6d5ad6030..0000000000000000000000000000000000000000 --- a/opam/tezos-scoru-wasm-test-helpers.opam +++ /dev/null @@ -1,28 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" - "ppx_deriving" - "octez-libs" - "tezos-scoru-wasm-durable-snapshot" - "tezos-scoru-wasm-fast" - "tezos-scoru-wasm-helpers" - "qcheck-alcotest" { >= "0.20" } - "octez-alcotezt" - "tezos-webassembly-interpreter-extra" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Helpers for test of the smart rollup wasm functionality" diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam deleted file mode 100644 index 46782c183c2e312900709319d0546f06a143c262..0000000000000000000000000000000000000000 --- a/opam/tezos-scoru-wasm-test.opam +++ /dev/null @@ -1,28 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_import" {with-test} - "ppx_deriving" {with-test} - "tezt" { with-test & >= "3.1.1" } - "octez-libs" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "octez-alcotezt" {with-test} - "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm-test-helpers" {with-test} - "tezos-webassembly-interpreter-extra" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tests for the scoru-wasm functionality" diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam deleted file mode 100644 index 80d96e5527c7e72d730332547afc51e070ec74e9..0000000000000000000000000000000000000000 --- a/opam/tezos-shell-benchmarks.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-benchmark" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: shell benchmarks" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam deleted file mode 100644 index 86ef48d7cf0cae50e64b0d766152ccf00ee30b71..0000000000000000000000000000000000000000 --- a/opam/tezos-shell.opam +++ /dev/null @@ -1,33 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_expect" - "lwt-watcher" { = "0.2" } - "lwt-canceler" { >= "0.3" & < "0.4" } - "prometheus" { >= "1.2" } - "octez-libs" - "tezos-store" - "tezos-context-ops" - "tezos-protocol-updater" - "tezos-validation" - "lwt-exit" - "tezt" { with-test & >= "3.1.1" } - "tezos-embedded-protocol-demo-noops" {with-test} - "octez-alcotezt" {with-test} - "tezos-version" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: core of `octez-node` (gossip, validation scheduling, mempool, ...)" diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam deleted file mode 100644 index 1fe041425324a65dbaf133317fb3c3897737240d..0000000000000000000000000000000000000000 --- a/opam/tezos-signer-backends.opam +++ /dev/null @@ -1,33 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" - "tezos-signer-services" - "uri" { >= "3.1.0" } - "ocplib-endian" - "fmt" { >= "0.8.7" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -depopts: [ - "ledgerwallet-tezos" -] -conflicts: [ - "ledgerwallet-tezos" { < "0.3.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: remote-signature backends for `tezos-client`" diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam deleted file mode 100644 index 96172384dc6a328ad27aa1e50da88c081ec7baf2..0000000000000000000000000000000000000000 --- a/opam/tezos-signer-services.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-client-base" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: descriptions of RPCs exported by `tezos-signer`" diff --git a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam index f10680f08a6aa09eea9056550834b0895a23a32c..11af261c8103d1da95d43b9402dd5a9db7d77bb3 100644 --- a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-016-PtMumbai" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam index 970980cff472f4724d8c50b4e110ca13ee781cc9..4001b4a7e9c2728d766269f2eee48bd7405a8deb 100644 --- a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam +++ b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-layer2-018-Proxford.opam b/opam/tezos-smart-rollup-layer2-018-Proxford.opam index 4fcdee20560ee7d47151d114c60adfb54fc5bf44..a3a2b43bb5e2435ca5d4d1f9ca4b0590e793e02a 100644 --- a/opam/tezos-smart-rollup-layer2-018-Proxford.opam +++ b/opam/tezos-smart-rollup-layer2-018-Proxford.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-018-Proxford" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-smart-rollup-layer2-alpha.opam b/opam/tezos-smart-rollup-layer2-alpha.opam index 45f54b6ad5efb7498f953a7e75680be107d18977..b213d6ed2c5d817cfc31f4b6f8c47f5b2086815e 100644 --- a/opam/tezos-smart-rollup-layer2-alpha.opam +++ b/opam/tezos-smart-rollup-layer2-alpha.opam @@ -14,7 +14,7 @@ depends: [ "octez-libs" "tezos-protocol-alpha" "octez-injector" - "octez-smart-rollup" + "octez-l2-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 850947877fbfbfc5f68207a98ca2c6941df39e2f..580faec8bb4c798fe367ed3422dd9e4ff29f8b44 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -18,9 +18,10 @@ depends: [ "lwt" { >= "5.7.0" } "tezos-baking-alpha" "tezos-client-alpha" - "tezos-client-base-unix" + "octez-shell-libs" "tezos-protocol-alpha" "tezt" { >= "3.1.1" } + "tezt-tezos" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 0c3bd20034a8c0f536ec5867fb2d877940d67a42..69e25b3dbb48ca049a4e5ef3bf854c4df45662c1 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -12,6 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} + "octez-l2-libs" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam deleted file mode 100644 index 4441940d7d09799c636a36a29cd497f2d6e498de..0000000000000000000000000000000000000000 --- a/opam/tezos-validation.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-context-ops" - "tezos-protocol-updater" - "tezos-version" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library for block validation" diff --git a/opam/tezos-wasmer.opam b/opam/tezos-wasmer.opam deleted file mode 100644 index f372d3e0dde8b4d5bcf313d679b546c4cd533cfd..0000000000000000000000000000000000000000 --- a/opam/tezos-wasmer.opam +++ /dev/null @@ -1,27 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_deriving" - "ctypes" { >= "0.18.0" } - "ctypes-foreign" { >= "0.18.0" } - "lwt" { >= "5.7.0" } - "tezos-rust-libs" { = "1.6" } -] -x-opam-monorepo-opam-provided: [ - "tezos-rust-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Wasmer bindings for SCORU WASM" diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam deleted file mode 100644 index e9256a7103ebb55d803ff69d55ddfb4096e9c2e7..0000000000000000000000000000000000000000 --- a/opam/tezos-webassembly-interpreter-extra.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam" "WebAssembly Authors"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "Apache-2.0" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "lwt" { >= "5.7.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Additional modules from the WebAssembly REPL used in testing" diff --git a/opam/tezt-ethereum.opam b/opam/tezt-ethereum.opam index 17ad96cf748eb6285073ceb9b51cda9d40df6688..f5bf616e9ddec3ed97533cd170ae06922a48c652 100644 --- a/opam/tezt-ethereum.opam +++ b/opam/tezt-ethereum.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "octez-libs" + "tezt-tezos" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-wasm-benchmark-lib.opam b/opam/tezt-tezos.opam similarity index 81% rename from opam/octez-smart-rollup-wasm-benchmark-lib.opam rename to opam/tezt-tezos.opam index ebf3b5a2e2e005f6a0aca042ddf8ff1d875d97ae..5391162e76b2b834ddf546f0166b88aa1180c096 100644 --- a/opam/octez-smart-rollup-wasm-benchmark-lib.opam +++ b/opam/tezt-tezos.opam @@ -10,15 +10,15 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "ppx_deriving" - "octez-libs" "tezt" { >= "3.1.1" } - "tezos-scoru-wasm-helpers" - "lwt" { >= "5.7.0" } + "uri" { >= "3.1.0" } + "cohttp-lwt-unix" { >= "5.2.0" } + "hex" { >= "1.3.0" } + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -synopsis: "Smart Rollup WASM benchmark library" +synopsis: "Octez test framework based on Tezt" diff --git a/src/bin_client/dune b/src/bin_client/dune index 3f893b06ce7ef4b53d371026261202779dbf2898..e48900d144da10dcf234512f617332a1890c3f9d 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -12,13 +12,13 @@ octez-libs.tezos-clic octez-libs.tezos-rpc-http-client octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-commands - tezos-mockup-commands - tezos-proxy - tezos-client-base-unix - tezos-signer-backends.unix + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-signer-backends.unix uri (select void_for_linking-tezos-client-genesis from (tezos-client-genesis -> void_for_linking-tezos-client-genesis.empty) diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune index 9275ef12854e76d692e13366acf41eba006157dc..c639d0ae5a563896eec474c3232900e6063aac17 100644 --- a/src/bin_dac_client/dune +++ b/src/bin_dac_client/dune @@ -10,9 +10,9 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib tezos-dac-lib diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index a6c73a1db976cae3746812d13710fa2521d82a25..05857d0ddc1c053a6924658a39e6394b1e26b5ee 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -10,18 +10,18 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib tezos-dac-lib tezos_dac_node_lib - tezos_layer2_store + octez-l2-libs.tezos_layer2_store irmin-pack irmin-pack.unix irmin diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 228c3384169c60d62fb6f627ab7a61ee673b7fd9..fe2c50eef5fa6cb1ae5b59c7944a198552b9426d 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -11,28 +11,28 @@ octez-libs.tezos-base.unix octez-libs.tezos-version cmdliner - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib tezos-dal-node-lib tezos-dal-node-services - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-libs.tezos-crypto-dal - tezos-store.unix - tezos-store.shared + octez-shell-libs.tezos-store.unix + octez-shell-libs.tezos-store.shared octez-libs.tezos-gossipsub tezos-dal-node-lib.gossipsub - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-crypto octez-libs.tezos-base.p2p-identity-file - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services irmin-pack irmin-pack.unix irmin diff --git a/src/bin_node/dune b/src/bin_node/dune index 7362b2a2dfe762b277bf3ccdcf3678d7319a6160..27f244e3eafd48f5b638b87876d0e03961178429 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -13,19 +13,19 @@ tezos-version.value octez-node-config octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server - octez-libs.tezos-p2p - tezos-shell - tezos-store - tezos-store.unix-reconstruction - tezos-store.unix-snapshots + octez-shell-libs.tezos-p2p + octez-shell-libs.tezos-shell + octez-shell-libs.tezos-store + octez-shell-libs.tezos-store.unix-reconstruction + octez-shell-libs.tezos-store.unix-snapshots octez-libs.tezos-context - tezos-validation - octez-libs.tezos-shell-context + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-shell-context octez-libs.tezos-workers - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater cmdliner fmt.cli fmt.tty diff --git a/src/bin_octogram/dune b/src/bin_octogram/dune index 0cf8e9d5b96702dd427461fe6653a0d4b317ffbc..2131fd3bf465f4e4b363d273f8ed2503fdabe436 100644 --- a/src/bin_octogram/dune +++ b/src/bin_octogram/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos octogram yaml) (link_flags diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index f5e5591004cc02508a8361e546a7a65a6070daea..85018824bafa1dfa1ee8c8dfc87caeccef00dd70 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -14,12 +14,12 @@ cmdliner lwt-exit lwt.unix - tezos-proxy + octez-shell-libs.tezos-proxy tezos-proxy-server-config octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-rpc-http-server - octez-libs.tezos-shell-services - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-shell-context tezos-version.value uri (select void_for_linking-tezos-client-genesis from diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune index 7f97df3f6dec9ed255b776a0e33b5ede84f995c4..30d3ccd63ccb85e16ddfe503c66e73a504f044bb 100644 --- a/src/bin_sequencer_node/dune +++ b/src/bin_sequencer_node/dune @@ -9,9 +9,9 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands octez-smart-rollup-node-lib tezos-client-alpha octez_smart_rollup_node_alpha diff --git a/src/bin_signer/dune b/src/bin_signer/dune index dc4fcedf4a6b7af0c44981c58c7979d52a3f98a3..c0d6edbd4bedc8a442f07ee97ad53d10153ddfba 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -10,16 +10,16 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-clic - tezos-client-base - tezos-client-base-unix - tezos-client-commands - tezos-signer-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-signer-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - tezos-signer-backends.unix) + octez-shell-libs.tezos-signer-backends.unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune index d7a64078e6df724779ca728ec93a5823155148d9..f6ce017e7676c6052d725c590f468787c82d342d 100644 --- a/src/bin_smart_rollup_node/dune +++ b/src/bin_smart_rollup_node/dune @@ -9,11 +9,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands - octez-smart-rollup + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-l2-libs.octez-smart-rollup octez-smart-rollup-node-lib octez_smart_rollup_node_PtNairob octez_smart_rollup_node_Proxford diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 22ea8f981fdb4afefa8fcf0082f3b237274fcb6e..581bea9c238696e1a772e62d86963fd7f66516f5 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -13,7 +13,7 @@ octez-libs.tezos-clic tezos-benchmark tezos-benchmark-examples - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks tezos-benchmarks-proto-alpha str pyml diff --git a/src/bin_testnet_scenarios/dune b/src/bin_testnet_scenarios/dune index cf8a2f8f274381b38a987042f8a4ebf032292e78..b06a169b7304a44e2a5c3c0aff5500f8f3684293 100644 --- a/src/bin_testnet_scenarios/dune +++ b/src/bin_testnet_scenarios/dune @@ -7,7 +7,7 @@ (package octez-testnet-scenarios) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos tezt_ethereum) (flags (:standard) diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index 68b0ab7c16ade4eca5accd4eae0d9056ba407691..6e6fecf6627b929937581dff6e577ece4c537fdc 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -15,11 +15,11 @@ lwt tezos-baking-alpha tezos-client-alpha.commands - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-alpha tezt - octez-libs.tezt-tezos - octez-libs.tezt-performance-regression + tezt-tezos + tezt-tezos.tezt-performance-regression uri) (link_flags (:standard) @@ -30,7 +30,7 @@ -open Tezt -open Tezt.Base -open Tezt_tezos - -open Tezt_performance_regression)) + -open Tezt_tezos_tezt_performance_regression)) (rule (targets sql.ml) diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index 5aa938099433d2ebda04ed11a48794a8f61f300c..d23198b63ba7dd7f170c7ab7eec9d747ad6b641f 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -13,10 +13,10 @@ octez-libs.tezos-base.unix yaml tezos-client-alpha - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-helpers - octez-libs.tezos-webassembly-interpreter - tezos-webassembly-interpreter-extra + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-helpers + octez-l2-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter-extra tezos-version.value) (link_flags (:standard) diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index d27596c92e0ac4a882d39a2286c7bc8d6b86c6ca..e2e78589e0635f51a1fbe77cabe34e4b66c965be 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -37,10 +37,7 @@ It contains the following libraries: - {{!module-Tezos_lazy_containers}Tezos_lazy_containers}: A collection of lazy containers whose contents is fetched from arbitrary backend on-demand - {{!page-tezos_lwt_result_stdlib}Tezos_lwt_result_stdlib}: error-aware stdlib replacement - {{!module-Tezos_micheline}Tezos_micheline}: Internal AST and parser for the Michelson language -- {{!module-Tezos_p2p}Tezos_p2p}: Library for a pool of P2P connections - {{!module-Tezos_p2p_services}Tezos_p2p_services}: Descriptions of RPCs exported by [tezos-p2p] -- {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} -- {{!module-Tezos_protocol_environment}Tezos_protocol_environment} - {{!module-Tezos_requester}Tezos_requester} - {{!module-Tezos_rpc}Tezos_rpc}: Library of auto-documented RPCs (service and hierarchy descriptions) - {{!module-Tezos_rpc_http}Tezos_rpc_http}: Library of auto-documented RPCs (http server and client) @@ -48,18 +45,12 @@ It contains the following libraries: - {{!module-Tezos_rpc_http_client_unix}Tezos_rpc_http_client_unix}: Unix implementation of the RPC client - {{!module-Tezos_rpc_http_server}Tezos_rpc_http_server}: Library of auto-documented RPCs (http server) - {{!module-Tezos_sapling}Tezos_sapling} -- {{!module-Tezos_scoru_wasm}Tezos_scoru_wasm} -- {{!module-Tezos_shell_context}Tezos_shell_context} -- {{!module-Tezos_shell_services}Tezos_shell_services}: Descriptions of RPCs exported by [tezos-shell] - {{!module-Tezos_stdlib}Tezos_stdlib}: Yet-another local-extension of the OCaml standard library - {{!module-Tezos_stdlib_unix}Tezos_stdlib_unix}: Yet-another local-extension of the OCaml standard library (unix-specific fragment) - {{!module-Tezos_test_helpers}Tezos_test_helpers} - {{!module-Tezos_tree_encoding}Tezos_tree_encoding}: A general-purpose library to encode arbitrary data in Merkle trees - {{!module-Tezos_version}Tezos_version}: Version information generated from Git -- {{!module-Tezos_webassembly_interpreter}Tezos_webassembly_interpreter} - {{!page-tezos_workers}Tezos_workers}: Worker library -- {{!module-Tezt_performance_regression}Tezt_performance_regression} -- {{!module-Tezt_tezos}Tezt_tezos}: Octez test framework based on Tezt - {{!module-Traced_functor_outputs}Traced_functor_outputs} - {{!module-Traced_sigs}Traced_sigs} - {{!module-Traced_structs}Traced_structs} diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index d964a15bd2378cc3e97c67d6358b3eaf970c422a..4c7dcfcbcf01b25b83f78561d000f5d819e8aabb 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -5,13 +5,13 @@ (library (name tezos_client_base) - (public_name tezos-client-base) + (public_name octez-shell-libs.tezos-client-base) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-clic octez-libs.tezos-rpc - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-sapling uri) (js_of_ocaml) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index 99f252c12536fd287371192b4b5c8c0649499ee4..be18f3e458486b0b34711d6051922f4fd99be062 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -9,7 +9,7 @@ (libraries tezt.core octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) @@ -35,7 +35,7 @@ (rule (alias runtest) - (package tezos-client-base) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -58,7 +58,7 @@ (rule (alias runtest_js) - (package tezos-client-base) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 5ee4d3e82734cbb850ff89b4a4416f03a182bb27..d37875efed3e04b53984da36f3e0e8d9a914bff0 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -3,7 +3,7 @@ (library (name tezos_client_base_unix) - (public_name tezos-client-base-unix) + (public_name octez-shell-libs.tezos-client-base-unix) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base @@ -12,16 +12,16 @@ octez-libs.tezos-rpc octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-commands - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-proxy - tezos-proxy.rpc - tezos-signer-backends.unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-proxy.rpc + octez-shell-libs.tezos-signer-backends.unix tezos-version.value lwt-exit uri) diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index 04c4615db990f26c728bb592ba1e1756e4fb1d48..595675a5fa70046c3c74795d94f27b0f9e60a9c5 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -7,8 +7,8 @@ (libraries tezt.core octez-libs.tezos-base - tezos-mockup-commands - tezos-client-base-unix + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) @@ -34,7 +34,7 @@ (rule (alias runtest) - (package tezos-client-base-unix) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 27d7540500b5705154d49eb534665b08c2a66b94..033cc887633200d478235ae09195fa49acbcb3e3 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -3,19 +3,19 @@ (library (name tezos_client_commands) - (public_name tezos-client-commands) + (public_name octez-shell-libs.tezos-client-commands) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-rpc octez-libs.tezos-clic octez-libs.tezos-clic.unix - tezos-client-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-shell-services octez-libs.tezos-p2p-services octez-libs.tezos-stdlib-unix octez-libs.tezos-base.unix - tezos-signer-backends + octez-shell-libs.tezos-signer-backends data-encoding uri) (library_flags (:standard -linkall)) diff --git a/src/lib_crawler/dune b/src/lib_crawler/dune index 0dd9be76bfc6d333a4d21e98d3cb50d389437b2d..45869f72a58e04c5d11d5891f3e16d048fc2e00a 100644 --- a/src/lib_crawler/dune +++ b/src/lib_crawler/dune @@ -10,8 +10,8 @@ octez-libs.tezos-rpc-http octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-shell) + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-shell) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dac/dune b/src/lib_dac/dune index 89e8ef887e9c6e67e6402b87eacdde14d80397d6..aa0e0420a24b2d66fdf2aded45fa6987c83e07e1 100644 --- a/src/lib_dac/dune +++ b/src/lib_dac/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-updater) + octez-shell-libs.tezos-protocol-updater) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dac_client/dune b/src/lib_dac_client/dune index c11e7e4afc3171821ac62e818c416e4bf3a05b16..54a8e4cf98c447c203cad63565216dc02781daba 100644 --- a/src/lib_dac_client/dune +++ b/src/lib_dac_client/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix tezos-dac-lib) (flags diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index 35783161984d818d4403719a31fcd607ad2c0b4b..c0ad4fd20e19627d451d766da95ec5b7391f41c6 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -8,10 +8,10 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-libs.tezos-rpc-http-server tezos-dac-lib tezos-dac-client-lib) diff --git a/src/lib_dal_node/dune b/src/lib_dal_node/dune index 2dc6dfd68ba39d807ca93db28b41c33b65200d0c..bb307b9ce5e344a03a7706afc68ca2a36198ed3f 100644 --- a/src/lib_dal_node/dune +++ b/src/lib_dal_node/dune @@ -9,12 +9,12 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-dal-node-services - tezos-client-base - tezos-protocol-updater - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-protocol-updater + octez-shell-libs.tezos-client-base-unix octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto-dal - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services) (flags (:standard) diff --git a/src/lib_dal_node/gossipsub/dune b/src/lib_dal_node/gossipsub/dune index c1aca057b7039868f23433e43a2e92ed8b38c2a7..d686b76af941858687ef399b3f10f99b99bbf852 100644 --- a/src/lib_dal_node/gossipsub/dune +++ b/src/lib_dal_node/gossipsub/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-crypto-dal octez-libs.tezos-gossipsub - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-crypto) (flags diff --git a/src/lib_injector/dune b/src/lib_injector/dune index 0f6ae1186538517dc8d2dab9863c8e4c7747b3d1..e14b4b413c22a827a467f76cd6b6c980c0d97e78 100644 --- a/src/lib_injector/dune +++ b/src/lib_injector/dune @@ -12,9 +12,9 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto octez-libs.tezos-micheline - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-workers - tezos-shell + octez-shell-libs.tezos-shell octez-crawler) (flags (:standard) diff --git a/src/lib_layer2_store/dune b/src/lib_layer2_store/dune index 95d8164c46cb87cf698dd89d29fc758e68769872..027f78779619d0bcc7a76ade4a8d0a2b64fb4a83 100644 --- a/src/lib_layer2_store/dune +++ b/src/lib_layer2_store/dune @@ -3,7 +3,7 @@ (library (name tezos_layer2_store) - (package tezos-layer2-store) + (public_name octez-l2-libs.tezos_layer2_store) (instrumentation (backend bisect_ppx)) (libraries index diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune index a43ba892b7f9fe4a9f7c00ae0489b04e75968c80..bf890e1fb08dba7e62c5a47593bec330c7d92026 100644 --- a/src/lib_layer2_store/test/dune +++ b/src/lib_layer2_store/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-error-monad - tezos_layer2_store + octez-l2-libs.tezos_layer2_store qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -31,7 +31,7 @@ (rule (alias runtest) - (package tezos-layer2-store) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 574895b062184de2ec21424cf222e0df69d894a1..9c312830a5f986ad22f8b3936018e42a5b6e3d45 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -3,13 +3,13 @@ (library (name tezos_mockup_registration) - (public_name tezos-mockup-registration) + (public_name octez-shell-libs.tezos-mockup-registration) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-client-base - octez-libs.tezos-shell-services - octez-libs.tezos-protocol-environment + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-shell-services + octez-proto-libs.tezos-protocol-environment uri) (flags (:standard) @@ -18,22 +18,22 @@ (library (name tezos_mockup) - (public_name tezos-mockup) + (public_name octez-shell-libs.tezos-mockup) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-client-base - tezos-mockup-proxy + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-mockup-proxy resto-cohttp-self-serving-client octez-libs.tezos-rpc octez-libs.tezos-p2p-services - octez-libs.tezos-p2p - octez-libs.tezos-protocol-environment + octez-shell-libs.tezos-p2p + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client - tezos-mockup-registration) + octez-shell-libs.tezos-mockup-registration) (flags (:standard) -open Tezos_base.TzPervasives @@ -48,15 +48,15 @@ (library (name tezos_mockup_commands) - (public_name tezos-mockup-commands) + (public_name octez-shell-libs.tezos-mockup-commands) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-clic - tezos-client-commands - tezos-client-base - tezos-mockup - tezos-mockup-registration) + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 035f619d987ca3c2d01212d247d41800d181a23a..8067b599118b78eab7d61e024d7d56cebdeb7829 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -10,9 +10,9 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers octez-libs.tezos-rpc - tezos-mockup - tezos-mockup-registration - tezos-client-base + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-client-base qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -39,7 +39,7 @@ (rule (alias runtest) - (package tezos-mockup) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index 0e7edc83a55dd2475c76a1e2917bf449d90e91f5..a150b600700f673e1b10b4fee492e5810eadfc8a 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -3,16 +3,16 @@ (library (name tezos_mockup_proxy) - (public_name tezos-mockup-proxy) + (public_name octez-shell-libs.tezos-mockup-proxy) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-client-base - octez-libs.tezos-protocol-environment + octez-shell-libs.tezos-client-base + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-rpc-http resto-cohttp-self-serving-client octez-libs.tezos-rpc-http-client - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services uri) (flags (:standard) diff --git a/src/lib_node_config/dune b/src/lib_node_config/dune index f4a45cc674431a18d1612652c0075bf5800454b1..a3053d9f41b6349749a133dd00da0e0ffd33d513 100644 --- a/src/lib_node_config/dune +++ b/src/lib_node_config/dune @@ -9,12 +9,12 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server octez-libs.tezos-context - tezos-store - tezos-validation) + octez-shell-libs.tezos-store + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_octogram/dune b/src/lib_octogram/dune index 903b825e8b253b886475eb3036f63a42e5813e55..8442970e5e1bd6d5b0fa2597f4c7e944a958d8fb 100644 --- a/src/lib_octogram/dune +++ b/src/lib_octogram/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt - octez-libs.tezt-tezos + tezt-tezos jingoo dmap) (flags diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune index bde1f4b880e6db6b6dfedeec106b9f1c14ccaad4..44e98363c4e683f7a36ef248bbe9a29558ffe4b8 100644 --- a/src/lib_p2p/dune +++ b/src/lib_p2p/dune @@ -3,7 +3,7 @@ (library (name tezos_p2p) - (public_name octez-libs.tezos-p2p) + (public_name octez-shell-libs.tezos-p2p) (instrumentation (backend bisect_ppx)) (libraries lwt-watcher diff --git a/src/lib_p2p/test/common/dune b/src/lib_p2p/test/common/dune index bc365c0e15aac0f69a09a67359821301e94936a0..ded7027f87d8b7764efc5ce9bb4f12f4c5665392 100644 --- a/src/lib_p2p/test/common/dune +++ b/src/lib_p2p/test/common/dune @@ -3,7 +3,7 @@ (library (name tezos_p2p_test_common) - (public_name octez-libs.tezos_p2p_test_common) + (public_name octez-shell-libs.tezos_p2p_test_common) (instrumentation (backend bisect_ppx)) (libraries tezt @@ -11,7 +11,7 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services) (flags (:standard) diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index d014e44232af5e36fcc217220eab8778061a3978..03ae158f874f3ddc023ac6a0c0971f55e9955099 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -19,13 +19,13 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers - octez-libs.tezos_p2p_test_common + octez-shell-libs.tezos_p2p_test_common octez-libs.tezos-p2p-services - octez-libs.tezt-tezos + tezt-tezos tezt octez-alcotezt astring) @@ -44,60 +44,60 @@ (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_socket.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_pool.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_broadcast.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_io_scheduler.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_peerset.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_buffer_reader.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_banned_peers.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_node.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_connect_handler.exe}))) (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (locks /locks/p2p) (action (run %{dep:./test_p2p_maintenance.exe}))) diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index 2b213b45aeb09c855e0d7c3fb1a01f2720dfb0f7..be0ee831ba612c0cd76f71bcc6feb3bec33c0734 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -10,12 +10,12 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - octez-libs.tezos-p2p + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers - octez-libs.tezos_p2p_test_common) + octez-shell-libs.tezos_p2p_test_common) (library_flags (:standard -linkall)) (flags (:standard) @@ -42,7 +42,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 508b9b4a8bc8b1dce0f4cbc581e119c86ef225b4..85964e5f7fb56cfb39a44452f44da3ea5df99e2e 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment.sigs octez-libs.tezos-stdlib-unix compiler-libs.common lwt.unix @@ -39,17 +39,17 @@ (rule (targets embedded-interfaces-env) - (deps (package octez-libs)) + (deps (package octez-proto-libs)) (action (with-stdout-to %{targets} (run bin/cmis_of_cma.exe - %{lib:octez-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa})))) + %{lib:octez-proto-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa})))) (rule (targets embedded_cmis_env.ml) - (deps (package octez-libs)) + (deps (package octez-proto-libs)) (action (run %{bin:ocp-ocamlres} -format variants -o %{targets} diff --git a/src/lib_protocol_compiler/registerer/dune b/src/lib_protocol_compiler/registerer/dune index 2552049fc3e8ed74946af3cc47b72da7763d77dc..16fe848835149da68fd2c6e9cc7bd8fbacda0297 100644 --- a/src/lib_protocol_compiler/registerer/dune +++ b/src/lib_protocol_compiler/registerer/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -opaque diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune index b7f00cab6f67eeaa4272781b3f70c5ec3c3e85ce..b469bb8687534bbbea6872a2fcab87eefae4dcee 100644 --- a/src/lib_protocol_environment/context_ops/dune +++ b/src/lib_protocol_environment/context_ops/dune @@ -3,14 +3,14 @@ (library (name tezos_context_ops) - (public_name tezos-context-ops) + (public_name octez-shell-libs.tezos-context-ops) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-error-monad - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-context - octez-libs.tezos-shell-context) + octez-shell-libs.tezos-shell-context) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index 4777ff32eec69aaa78d56a124b12a043c64a9539..ec919b29eab60545196cf947b7fad45911dabe4c 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_environment) - (public_name octez-libs.tezos-protocol-environment) + (public_name octez-proto-libs.tezos-protocol-environment) (instrumentation (backend bisect_ppx)) (libraries zarith @@ -16,14 +16,16 @@ aches-lwt octez-libs.tezos-base octez-libs.tezos-sapling - octez-libs.tezos-protocol-environment.sigs - octez-libs.tezos-protocol-environment.structs + octez-proto-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment.structs octez-libs.tezos-micheline octez-libs.tezos-context.memory - octez-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm octez-libs.tezos-event-logging) (flags (:standard) -open Plonk -open Tezos_base.TzPervasives -open Tezos_micheline)) + +(documentation (package octez-proto-libs)) diff --git a/src/lib_protocol_environment/index.mld b/src/lib_protocol_environment/index.mld new file mode 100644 index 0000000000000000000000000000000000000000..88edc6d4abbcb0ab4301ed6917cffd0833209df4 --- /dev/null +++ b/src/lib_protocol_environment/index.mld @@ -0,0 +1,7 @@ +{0 Octez-proto-libs: octez protocol libraries} + +This is a package containing some libraries related to the Tezos protocol. + +It contains the following libraries: + +- {{!module-Tezos_protocol_environment}Tezos_protocol_environment} diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune index ba925990c5c06af274ff8d26cba0af4a1c41fb6e..26bc415543e51403b95e60313b4de8600a5726af 100644 --- a/src/lib_protocol_environment/shell_context/dune +++ b/src/lib_protocol_environment/shell_context/dune @@ -3,11 +3,11 @@ (library (name tezos_shell_context) - (public_name octez-libs.tezos-shell-context) + (public_name octez-shell-libs.tezos-shell-context) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-context) (flags (:standard) diff --git a/src/lib_protocol_environment/sigs-internals/dune b/src/lib_protocol_environment/sigs-internals/dune index 01a3d1d18901f6b0e732b36a44b29634afc646bc..4845799f3694dcb111ef1db3c5acf8ced2e42f85 100644 --- a/src/lib_protocol_environment/sigs-internals/dune +++ b/src/lib_protocol_environment/sigs-internals/dune @@ -3,5 +3,5 @@ (library (name tezos_protocol_environment_sigs_internals) - (public_name octez-libs.tezos-protocol-environment.sigs-internals) + (public_name octez-proto-libs.tezos-protocol-environment.sigs-internals) (instrumentation (backend bisect_ppx))) diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune index 103e69c8e5ab2ca35749ab3c065eeb9c4a758377..da8cace5c32427bacb6396974e8dbc1d202383ce 100644 --- a/src/lib_protocol_environment/sigs/dune +++ b/src/lib_protocol_environment/sigs/dune @@ -3,10 +3,10 @@ (library (name tezos_protocol_environment_sigs) - (public_name octez-libs.tezos-protocol-environment.sigs) + (public_name octez-proto-libs.tezos-protocol-environment.sigs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment.sigs-internals) + octez-proto-libs.tezos-protocol-environment.sigs-internals) (flags (:standard) -nostdlib diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 7d13771ab19d6578de4fba6fcc81fef585b8845a..468fb882e9af5c6d492d638b9997887dcb2a1a1d 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -3,13 +3,13 @@ (library (name tezos_protocol_environment_structs) - (public_name octez-libs.tezos-protocol-environment.structs) + (public_name octez-proto-libs.tezos-protocol-environment.structs) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib octez-libs.tezos-crypto octez-libs.tezos-lwt-result-stdlib - octez-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm data-encoding bls12-381 octez-libs.octez-plonk) diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 043adafc6556d5be68e565e7961b9648f87bafaa..b4478e6ff8e47d96878e308c69c61355a73c70b8 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base.unix - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-alcotezt octez-libs.tezos-test-helpers qcheck-alcotest @@ -39,7 +39,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-proto-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index 8919447d3d24b0361986d246540c6bc1029e0aed..bdd63df2989ce7911e06252bba5268fdfa82801a 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-alcotezt octez-libs.tezos-test-helpers octez-libs.tezos-base - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,7 +32,7 @@ (rule (alias runtest) - (package tezos-shell-context-test) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index d002816146cb892bd08e852e5a13ba2dd6aa526b..6ae3f3afc51b471b09b6048809a7c1424b0495c9 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -3,15 +3,15 @@ (library (name tezos_protocol_updater) - (public_name tezos-protocol-updater) + (public_name octez-shell-libs.tezos-protocol-updater) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline - octez-libs.tezos-shell-services - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-services + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-context octez-protocol-compiler.registerer octez-protocol-compiler.native octez-libs.tezos-context diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index 462c3561d1856f69198cc9a7c51c3199a68b2d54..2a0f982b34416da14539bac08750b84098ba988f 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -3,17 +3,17 @@ (library (name tezos_proxy) - (public_name tezos-proxy) + (public_name octez-shell-libs.tezos-proxy) (instrumentation (backend bisect_ppx)) (libraries aches aches-lwt octez-libs.tezos-base octez-libs.tezos-clic - tezos-client-base - octez-libs.tezos-protocol-environment + octez-shell-libs.tezos-client-base + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-rpc - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-context.memory uri) (flags diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune index 7986c10b310bd01c1f875f25d41d1c33677ebbb9..9a051751aafb97013f50a0a224050f025e59c0d4 100644 --- a/src/lib_proxy/rpc/dune +++ b/src/lib_proxy/rpc/dune @@ -3,14 +3,14 @@ (library (name tezos_proxy_rpc) - (public_name tezos-proxy.rpc) + (public_name octez-shell-libs.tezos-proxy.rpc) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-client-base - tezos-mockup-proxy + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-mockup-proxy octez-libs.tezos-rpc - tezos-proxy + octez-shell-libs.tezos-proxy uri) (flags (:standard) diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index d4195dfb75af45b7ce3160645b9face50cb40ead..0f090eb2801e0ead696b2a225b8bdd56e09cd185 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - tezos-proxy + octez-shell-libs.tezos-proxy octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers tezos_proxy_test_helpers_shell_services @@ -45,7 +45,7 @@ (rule (alias runtest) - (package tezos-proxy) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_proxy/test_helpers/shell_services/dune b/src/lib_proxy/test_helpers/shell_services/dune index 3f93620fe9a8e43612d767f00ef10c81e56f6770..5dd9dd4ad4d06dbd2f492ab4149d7e1b015e1460 100644 --- a/src/lib_proxy/test_helpers/shell_services/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -5,7 +5,7 @@ (name tezos_proxy_test_helpers_shell_services) (libraries octez-libs.tezos-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-test-helpers qcheck-core octez-libs.tezos-context.memory diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index ebdbaf9bfbf8da4a1b9f72a4a29c66fefdd42810..6e8819bbdd0b460251f5d4b16458070873769ff4 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-test-helpers - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services tezos_proxy_test_helpers_shell_services qcheck-alcotest octez-alcotezt) @@ -33,7 +33,7 @@ (rule (alias runtest) - (package tezos-proxy) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune index 05bbffc8a56ce62076aa9b2b3c447b0d4c2f0302..0917fad7b604b1d02a0e5d8fc43163a65722e516 100644 --- a/src/lib_scoru_sequencer/dune +++ b/src/lib_scoru_sequencer/dune @@ -12,8 +12,8 @@ octez_smart_rollup_node_alpha octez-libs.tezos-workers octez-smart-rollup-node-lib - octez-smart-rollup - tezos-client-base + octez-l2-libs.octez-smart-rollup + octez-shell-libs.tezos-client-base octez-libs.tezos-rpc octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server) diff --git a/src/lib_scoru_wasm/bench/dune b/src/lib_scoru_wasm/bench/dune index 78345b9508546d3a7ac09a834bf498bb3a346391..9deadce80ec4f570f55f18bf5617dff2c2e72751 100644 --- a/src/lib_scoru_wasm/bench/dune +++ b/src/lib_scoru_wasm/bench/dune @@ -3,15 +3,15 @@ (library (name octez_smart_rollup_wasm_benchmark_lib) - (package octez-smart-rollup-wasm-benchmark-lib) + (public_name octez-l2-libs.octez_smart_rollup_wasm_benchmark_lib) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base tezt - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-libs.tezos-context.memory - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-helpers lwt.unix) (preprocess (pps ppx_deriving.show)) (flags diff --git a/src/lib_scoru_wasm/bench/executable/dune b/src/lib_scoru_wasm/bench/executable/dune index c3fa84e97fc4b303ae128b659c011a453da5a6b3..ead2af7dcd2bc08a4889e42c885e0fa54b949422 100644 --- a/src/lib_scoru_wasm/bench/executable/dune +++ b/src/lib_scoru_wasm/bench/executable/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez_smart_rollup_wasm_benchmark_lib) + octez-l2-libs.octez_smart_rollup_wasm_benchmark_lib) (preprocess (pps ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index 2ec4ab31364198a159212824af513d4cdc225c8c..2330b131dc9e4e2be9ae99927d90d3f9db43b329 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -3,13 +3,13 @@ (library (name tezos_scoru_wasm) - (public_name octez-libs.tezos-scoru-wasm) + (public_name octez-l2-libs.tezos-scoru-wasm) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding octez-libs.tezos-lazy-containers - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-libs.tezos-context.sigs octez-libs.tezos-context.memory octez-libs.tezos-lwt-result-stdlib diff --git a/src/lib_scoru_wasm/fast/dune b/src/lib_scoru_wasm/fast/dune index 7bea795e8d86df586c45838af28041d57ea14da5..1e355d8479a5d4ca8fac48fb8c4ca20f6eb386e3 100644 --- a/src/lib_scoru_wasm/fast/dune +++ b/src/lib_scoru_wasm/fast/dune @@ -3,15 +3,15 @@ (library (name tezos_scoru_wasm_fast) - (public_name tezos-scoru-wasm-fast) + (public_name octez-l2-libs.tezos-scoru-wasm-fast) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-libs.tezos-lazy-containers - octez-libs.tezos-scoru-wasm - tezos-wasmer) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-wasmer) (flags (:standard) -open Tezos_base.TzPervasives)) diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune index ecc2fe9d03610e6828d1937055cd0d224b912d42..bb6cbe07d79e67eb42b81e8f395c25fcbc42a85a 100644 --- a/src/lib_scoru_wasm/fast/test/dune +++ b/src/lib_scoru_wasm/fast/test/dune @@ -11,11 +11,11 @@ octez-libs.tezos-base.unix octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers - tezos-scoru-wasm-helpers - tezos_scoru_wasm_test_helpers + octez-l2-libs.tezos-scoru-wasm-helpers + octez-l2-libs.tezos_scoru_wasm_test_helpers octez-libs.tezos-test-helpers - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) @@ -48,7 +48,7 @@ (rule (alias runtest) - (package tezos-scoru-wasm-fast-test) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_scoru_wasm/helpers/dune b/src/lib_scoru_wasm/helpers/dune index 350c9c1420a3900fa396e7d2d7b50b7f7b739206..0cb3f95776293fabad1082c6a87c306e16696f10 100644 --- a/src/lib_scoru_wasm/helpers/dune +++ b/src/lib_scoru_wasm/helpers/dune @@ -3,16 +3,16 @@ (library (name tezos_scoru_wasm_helpers) - (public_name tezos-scoru-wasm-helpers) + (public_name octez-l2-libs.tezos-scoru-wasm-helpers) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding octez-libs.tezos-base.unix octez-libs.tezos-context.disk - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast + octez-l2-libs.tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune index 386454c8299c663c41b100eb4487d51fc48dc4d9..bccc3bdea7e1c5e2462f14e527556952cea3f7b8 100644 --- a/src/lib_scoru_wasm/regressions/dune +++ b/src/lib_scoru_wasm/regressions/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-test-helpers tezos-protocol-alpha tezos-smart-rollup-alpha diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune index fdc7fd78f4bea775f59821de0f9cbb416916b48d..39d847d4e820526a4e1355df62263e52570c0c9b 100644 --- a/src/lib_scoru_wasm/test/dune +++ b/src/lib_scoru_wasm/test/dune @@ -12,12 +12,12 @@ octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers - octez-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm qcheck-alcotest octez-alcotezt - tezos-scoru-wasm-helpers - tezos_scoru_wasm_test_helpers - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm-helpers + octez-l2-libs.tezos_scoru_wasm_test_helpers + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) @@ -61,7 +61,7 @@ (rule (alias runtest) - (package tezos-scoru-wasm-test) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_scoru_wasm/test/durable_snapshot/dune b/src/lib_scoru_wasm/test/durable_snapshot/dune index 34b957e7da7c950aa4afddcd4e3ef81a71c52359..062c7979ecfc5a438c7fb909d81eacdff4f6a03a 100644 --- a/src/lib_scoru_wasm/test/durable_snapshot/dune +++ b/src/lib_scoru_wasm/test/durable_snapshot/dune @@ -3,12 +3,12 @@ (library (name tezos_scoru_wasm_durable_snapshot) - (package tezos-scoru-wasm-durable-snapshot) + (public_name octez-l2-libs.tezos_scoru_wasm_durable_snapshot) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_scoru_wasm/test/helpers/dune b/src/lib_scoru_wasm/test/helpers/dune index 35caf1a0c5d1ccb7ba4d38d56604a1c034d49528..79f908a8bab1070614e1eb326f7f6a6515247193 100644 --- a/src/lib_scoru_wasm/test/helpers/dune +++ b/src/lib_scoru_wasm/test/helpers/dune @@ -3,7 +3,7 @@ (library (name tezos_scoru_wasm_test_helpers) - (package tezos-scoru-wasm-test-helpers) + (public_name octez-l2-libs.tezos_scoru_wasm_test_helpers) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base @@ -12,13 +12,13 @@ octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers - octez-libs.tezos-scoru-wasm - tezos_scoru_wasm_durable_snapshot - tezos-scoru-wasm-fast - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos_scoru_wasm_durable_snapshot + octez-l2-libs.tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm-helpers qcheck-alcotest octez-alcotezt - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 4267e9359a4edb36d776b4efadcdfa55b5798f83..4d50e6ca00e2247e1de4e07af9bc2db43d6bc762 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -3,7 +3,7 @@ (library (name tezos_shell) - (public_name tezos-shell) + (public_name octez-shell-libs.tezos-shell) (instrumentation (backend bisect_ppx)) (libraries lwt-watcher @@ -13,19 +13,19 @@ octez-libs.tezos-base.unix octez-libs.tezos-rpc octez-libs.tezos-context - tezos-store - tezos-store.shared - octez-libs.tezos-protocol-environment - tezos-context-ops - octez-libs.tezos-shell-context - octez-libs.tezos-p2p + octez-shell-libs.tezos-store + octez-shell-libs.tezos-store.shared + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-p2p octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-p2p-services - tezos-protocol-updater + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-requester octez-libs.tezos-workers - tezos-validation + octez-shell-libs.tezos-validation octez-libs.tezos-version octez-libs.tezos-crypto-dal.octez-dal-config lwt-exit) @@ -53,4 +53,4 @@ -open Tezos_version -open Tezos_crypto_dal_octez_dal_config)) -(documentation (package tezos-shell)) +(documentation (package octez-shell-libs) (mld_files octez_shell)) diff --git a/src/lib_shell/index.mld b/src/lib_shell/index.mld index 28cad5959054867a7aa9442c6b8cf7fdd22d5fd7..e5e09198ee149599ae23cf552f26fd0b4663b932 100644 --- a/src/lib_shell/index.mld +++ b/src/lib_shell/index.mld @@ -1,9 +1,27 @@ -{0 tezos-shell index} +{0 Octez-shell-libs: octez shell libraries} -{1 Library tezos-shell} +This is a package containing some libraries used by the shell of Octez. -The entry point of this library is the module: {!Tezos_shell}. +It contains the following libraries: -{1 Prevalidator implementation overview} - -You can find the implementation overview of the prevalidator {{!page-prevalidator} here}. +- {{!module-Mocked}Mocked} +- {{!module-Tezos_client_base}Tezos_client_base}: Tezos: common helpers for `tezos-client` +- {{!module-Tezos_client_base_unix}Tezos_client_base_unix}: Tezos: common helpers for `tezos-client` (unix-specific fragment) +- {{!module-Tezos_client_commands}Tezos_client_commands}: Tezos: protocol agnostic commands for `tezos-client` +- {{!module-Tezos_context_ops}Tezos_context_ops}: Backend-agnostic operations on contexts +- {{!module-Tezos_mockup}Tezos_mockup}: Tezos: library of auto-documented RPCs (mockup mode) +- {{!module-Tezos_mockup_commands}Tezos_mockup_commands}: Tezos: library of auto-documented RPCs (commands) +- {{!module-Tezos_mockup_proxy}Tezos_mockup_proxy}: Tezos: local RPCs +- {{!module-Tezos_mockup_registration}Tezos_mockup_registration}: Tezos: protocol registration for the mockup mode +- {{!module-Tezos_p2p}Tezos_p2p}: Library for a pool of P2P connections +- {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} +- {{!module-Tezos_protocol_updater}Tezos_protocol_updater}: Economic-protocol dynamic loading for `octez-node` +- {{!module-Tezos_proxy}Tezos_proxy}: Tezos: proxy +- {{!page-tezos_shell}Tezos_shell}: Core of `octez-node` (gossip, validation scheduling, mempool, ...) +- {{!module-Tezos_shell_benchmarks}Tezos_shell_benchmarks}: Tezos: shell benchmarks +- {{!module-Tezos_shell_context}Tezos_shell_context} +- {{!module-Tezos_shell_services}Tezos_shell_services}: Descriptions of RPCs exported by [tezos-shell] +- {{!module-Tezos_signer_backends}Tezos_signer_backends}: Tezos: remote-signature backends for `tezos-client` +- {{!module-Tezos_signer_services}Tezos_signer_services}: Tezos: descriptions of RPCs exported by `tezos-signer` +- {{!module-Tezos_store}Tezos_store}: Store for `octez-node` +- {{!module-Tezos_validation}Tezos_validation}: Library for block validation diff --git a/src/lib_shell/octez_shell.mld b/src/lib_shell/octez_shell.mld new file mode 100644 index 0000000000000000000000000000000000000000..28cad5959054867a7aa9442c6b8cf7fdd22d5fd7 --- /dev/null +++ b/src/lib_shell/octez_shell.mld @@ -0,0 +1,9 @@ +{0 tezos-shell index} + +{1 Library tezos-shell} + +The entry point of this library is the module: {!Tezos_shell}. + +{1 Prevalidator implementation overview} + +You can find the implementation overview of the prevalidator {{!page-prevalidator} here}. diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 6de78b1250b8902e71a26baebc9d9c6003667bb2..3357137fcfd75c2243dcfd7a54d5cdffc4a3fd03 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -8,20 +8,20 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base-test-helpers - tezos-store - tezos-store.shared + octez-shell-libs.tezos-store + octez-shell-libs.tezos-store.shared octez-libs.tezos-context - tezos-context-ops - octez-libs.tezos-shell-context - tezos-protocol-updater - octez-libs.tezos-p2p + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-protocol-updater + octez-shell-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-requester - tezos-shell - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell + octez-shell-libs.tezos-shell-services tezos-embedded-protocol-demo-noops octez-libs.tezos-stdlib-unix - tezos-validation + octez-shell-libs.tezos-validation octez-libs.tezos-event-logging-test-helpers octez-libs.tezos-test-helpers octez-alcotezt @@ -79,7 +79,7 @@ (rule (alias runtest) - (package tezos-shell) + (package octez-shell-tests) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune index 524223a052af6046647e283e89a9243fe272fced..990ee0ebff580abdcf3b25721137fd9ea880073e 100644 --- a/src/lib_shell_benchmarks/dune +++ b/src/lib_shell_benchmarks/dune @@ -3,7 +3,7 @@ (library (name tezos_shell_benchmarks) - (public_name tezos-shell-benchmarks) + (public_name octez-shell-libs.tezos-shell-benchmarks) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib @@ -12,7 +12,7 @@ tezos-benchmark octez-libs.tezos-crypto octez-libs.tezos-context - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune index bba5e5ae85cfd3caebbb6bc624d12b45c9cc9f02..d00851735e0092b0c9ada469086b70a530fdc3b7 100644 --- a/src/lib_shell_services/dune +++ b/src/lib_shell_services/dune @@ -5,7 +5,7 @@ (library (name tezos_shell_services) - (public_name octez-libs.tezos-shell-services) + (public_name octez-shell-libs.tezos-shell-services) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index bc60905d5fe94b0bc9b6ed894576425729e5e953..fe1c40853a6c52c2cef00b902e7d8aca086d43c1 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -9,7 +9,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) @@ -33,7 +33,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) @@ -53,7 +53,7 @@ (rule (alias runtest_js) - (package octez-libs) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune index 25cdd0945380c4685483ea3426918e686e8afdf4..7d2afc3468d49286744648fd69e3268ae9d2dce7 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -3,16 +3,16 @@ (library (name tezos_signer_backends) - (public_name tezos-signer-backends) + (public_name octez-shell-libs.tezos-signer-backends) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client - tezos-signer-services - octez-libs.tezos-shell-services + octez-shell-libs.tezos-signer-services + octez-shell-libs.tezos-shell-services uri) (flags (:standard) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index b661922ff448160e7af84c3ccb1697b71a2477a7..e3ccc3ae006cdf16ee6a06930c2496842dfcc12d 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -11,8 +11,8 @@ octez-libs.tezos-stdlib octez-libs.tezos-error-monad octez-libs.tezos-crypto - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends octez-alcotezt uri) (library_flags (:standard -linkall)) @@ -41,7 +41,7 @@ (rule (alias runtest) - (package tezos-signer-backends) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 2b6076289144367f7e264ec2eac1df6a59d4b6f8..22f062164962b53cd3a53dd31aa0ea3fe04b464d 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -3,7 +3,7 @@ (library (name tezos_signer_backends_unix) - (public_name tezos-signer-backends.unix) + (public_name octez-shell-libs.tezos-signer-backends.unix) (instrumentation (backend bisect_ppx)) (libraries ocplib-endian.bigstring @@ -13,13 +13,13 @@ octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib - tezos-client-base + octez-shell-libs.tezos-client-base octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client octez-libs.tezos-rpc-http-client-unix - tezos-signer-services - tezos-signer-backends - octez-libs.tezos-shell-services + octez-shell-libs.tezos-signer-services + octez-shell-libs.tezos-signer-backends + octez-shell-libs.tezos-shell-services uri (select ledger.ml from (ledgerwallet-tezos -> ledger.available.ml) diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 9aa37139e8aa996ce6bf76aaa96979755e59a26e..0912b2c762a0a48c074142b9901ea94b9f472d11 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -9,8 +9,8 @@ octez-libs.tezos-error-monad octez-libs.tezos-stdlib octez-libs.tezos-crypto - tezos-client-base - tezos-signer-backends.unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends.unix octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -37,7 +37,7 @@ (rule (alias runtest) - (package tezos-signer-backends) + (package octez-shell-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index b34a5985a2f8030a80ec8974146c67b036275500..90026f18e1e0c7ce1289830becff5d87ba31a74a 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -5,12 +5,12 @@ (library (name tezos_signer_services) - (public_name tezos-signer-services) + (public_name octez-shell-libs.tezos-signer-services) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-rpc - tezos-client-base) + octez-shell-libs.tezos-client-base) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_smart_rollup/dune b/src/lib_smart_rollup/dune index 18459aaba35aaaf1b8397c7e3911fb26dd4371e2..9f2484ae7fb46acad2179e3968893d00d63c9530 100644 --- a/src/lib_smart_rollup/dune +++ b/src/lib_smart_rollup/dune @@ -3,7 +3,7 @@ (library (name octez_smart_rollup) - (public_name octez-smart-rollup) + (public_name octez-l2-libs.octez-smart-rollup) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base @@ -17,3 +17,5 @@ -open Tezos_base -open Tezos_stdlib_unix -open Tezos_crypto)) + +(documentation (package octez-l2-libs)) diff --git a/src/lib_smart_rollup/index.mld b/src/lib_smart_rollup/index.mld new file mode 100644 index 0000000000000000000000000000000000000000..06eb3a692d7916e2efe1623699a7af20e07ecb95 --- /dev/null +++ b/src/lib_smart_rollup/index.mld @@ -0,0 +1,17 @@ +{0 Octez-l2-libs: octez layer2 libraries} + +This is a package containing some libraries used by the layer 2 of Octez. + +It contains the following libraries: + +- {{!module-Octez_smart_rollup}Octez_smart_rollup}: Octez: library for Smart Rollups +- {{!module-Octez_smart_rollup_wasm_benchmark_lib}Octez_smart_rollup_wasm_benchmark_lib}: Smart Rollup WASM benchmark library +- {{!module-Tezos_layer2_store}Tezos_layer2_store}: Tezos: layer2 storage utils +- {{!module-Tezos_scoru_wasm}Tezos_scoru_wasm} +- {{!module-Tezos_scoru_wasm_durable_snapshot}Tezos_scoru_wasm_durable_snapshot}: Durable storage reference implementation +- {{!module-Tezos_scoru_wasm_fast}Tezos_scoru_wasm_fast}: WASM functionality for SCORU Fast Execution +- {{!module-Tezos_scoru_wasm_helpers}Tezos_scoru_wasm_helpers}: Helpers for the smart rollup wasm functionality and debugger +- {{!module-Tezos_scoru_wasm_test_helpers}Tezos_scoru_wasm_test_helpers}: Helpers for test of the smart rollup wasm functionality +- {{!module-Tezos_wasmer}Tezos_wasmer}: Wasmer bindings for SCORU WASM +- {{!module-Tezos_webassembly_interpreter}Tezos_webassembly_interpreter} +- {{!module-Tezos_webassembly_interpreter_extra}Tezos_webassembly_interpreter_extra}: Additional modules from the WebAssembly REPL used in testing diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune index d6cdfc2458851d9e5d20a14f14af5c15952deb6f..75afd8988e048212ca17e5072f95663740c80a0e 100644 --- a/src/lib_smart_rollup_node/dune +++ b/src/lib_smart_rollup_node/dune @@ -10,8 +10,8 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix cohttp-lwt-unix octez-node-config prometheus-app @@ -20,10 +20,10 @@ tezos-dac-client-lib octez-injector tezos-version.value - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-workers - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_store/dune b/src/lib_store/dune index 741611718ad71ed0ff154b3e8c96804c3cf11b90..729bcf9c2ec4da3c3d3e049aa666954349b43f99 100644 --- a/src/lib_store/dune +++ b/src/lib_store/dune @@ -3,17 +3,17 @@ (library (name tezos_store) - (public_name tezos-store) + (public_name octez-shell-libs.tezos-store) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-crypto octez-libs.tezos-rpc lwt-watcher - octez-libs.tezos-shell-services - tezos-validation - tezos-context-ops - tezos-store.shared) + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-store.shared) (flags (:standard) -open Tezos_base @@ -24,4 +24,4 @@ -open Tezos_context_ops -open Tezos_store_shared) (virtual_modules store) - (default_implementation tezos-store.real)) + (default_implementation octez-shell-libs.tezos-store.real)) diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune index 981b60cd14aa1af45f57f313147560f8f8732268..032228ea36184984d5b3de7cc68303ea6ba26673 100644 --- a/src/lib_store/mocked/dune +++ b/src/lib_store/mocked/dune @@ -2,19 +2,19 @@ ; Edit file manifest/main.ml instead. (library - (name tezos_store_mocked) - (public_name tezos-store.mocked) - (implements tezos-store) + (name mocked) + (public_name octez-shell-libs.mocked) + (implements octez-shell-libs.tezos-store) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-crypto - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-context.memory - tezos-context-ops - tezos-validation - octez-libs.tezos-protocol-environment - tezos-store.shared) + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-validation + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-store.shared) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_store/real/dune b/src/lib_store/real/dune index dde874c6d5ad36ac63a538291e25b1ab4043cfe7..5de4ed3741f871e50242e32784a08cbfc4a40e95 100644 --- a/src/lib_store/real/dune +++ b/src/lib_store/real/dune @@ -3,11 +3,11 @@ (library (name tezos_store_real) - (public_name tezos-store.real) - (implements tezos-store) + (public_name octez-shell-libs.tezos-store.real) + (implements octez-shell-libs.tezos-store) (instrumentation (backend bisect_ppx)) (libraries - tezos-store.unix) + octez-shell-libs.tezos-store.unix) (flags (:standard) -open Tezos_store_unix)) diff --git a/src/lib_store/shared/dune b/src/lib_store/shared/dune index b60a3584631e790bd82904fd981b91a740a1ad60..7144a73ec8f9b0aafab2f0226be1a029415fbf5d 100644 --- a/src/lib_store/shared/dune +++ b/src/lib_store/shared/dune @@ -3,16 +3,16 @@ (library (name tezos_store_shared) - (public_name tezos-store.shared) + (public_name octez-shell-libs.tezos-store.shared) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-crypto - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services aches aches-lwt - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_stdlib_unix diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune index 3e13c03bb442770593d3a22a0afa7f125c9a2e5c..b7373e9100b103c4857b6d412325f4001f822a47 100644 --- a/src/lib_store/unix/dune +++ b/src/lib_store/unix/dune @@ -3,21 +3,21 @@ (library (name tezos_store_unix) - (public_name tezos-store.unix) + (public_name octez-shell-libs.tezos-store.unix) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-base octez-libs.tezos-version index irmin-pack - tezos-store.shared - octez-libs.tezos-protocol-environment + octez-shell-libs.tezos-store.shared + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-context - tezos-context-ops - octez-libs.tezos-shell-context - tezos-validation - tezos-protocol-updater + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib octez-libs.tezos-crypto @@ -55,18 +55,18 @@ (library (name tezos_store_unix_reconstruction) - (public_name tezos-store.unix-reconstruction) + (public_name octez-shell-libs.tezos-store.unix-reconstruction) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto - octez-libs.tezos-shell-services - tezos-protocol-updater - tezos-validation - tezos-context-ops - tezos-store.shared - tezos-store.unix) + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-protocol-updater + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-store.shared + octez-shell-libs.tezos-store.unix) (flags (:standard) -open Tezos_base @@ -83,17 +83,17 @@ (library (name tezos_store_unix_snapshots) - (public_name tezos-store.unix-snapshots) + (public_name octez-shell-libs.tezos-store.unix-snapshots) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.tezos-context - tezos-validation - tezos-store.shared - tezos-store.unix) + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-store.shared + octez-shell-libs.tezos-store.unix) (flags (:standard) -open Tezos_base diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 7786f907a0c3ad34acb03cc087c580cc10ef9d2f..d26b95f3cebfc4669971e27637ace70acebea63f 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -8,15 +8,15 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-crypto - tezos-context-ops - tezos-store.shared - tezos-store.unix - tezos-store.unix-reconstruction - tezos-store.unix-snapshots - octez-libs.tezos-shell-services + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-store.shared + octez-shell-libs.tezos-store.unix + octez-shell-libs.tezos-store.unix-reconstruction + octez-shell-libs.tezos-store.unix-snapshots + octez-shell-libs.tezos-shell-services octez-libs.tezos-stdlib-unix - tezos-validation - tezos-protocol-updater + octez-shell-libs.tezos-validation + octez-shell-libs.tezos-protocol-updater tezos-embedded-protocol-demo-noops tezos-embedded-protocol-genesis tezos-embedded-protocol-alpha @@ -73,7 +73,7 @@ (rule (alias runtest) - (package tezos-store) + (package octez-store-tests) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index f4ca3ba9d05ac6c4f4cd795ac3c92649ea01b947..474bb9df7e9e3fadc9001e294288060d11855b8b 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -12,7 +12,7 @@ octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers octez-libs.tezos-test-helpers - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_validation/dune b/src/lib_validation/dune index 9529f8c126d1ae804498e756635598921041617f..0b60c0d47ceee7fc9d25086b98b28437ef4f8c6b 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -3,7 +3,7 @@ (library (name tezos_validation) - (public_name tezos-validation) + (public_name octez-shell-libs.tezos-validation) (instrumentation (backend bisect_ppx)) (instrumentation (backend tezos-time-measurement)) (libraries @@ -11,10 +11,10 @@ octez-libs.tezos-crypto octez-libs.tezos-rpc octez-libs.tezos-context - tezos-context-ops - octez-libs.tezos-shell-context - octez-libs.tezos-shell-services - tezos-protocol-updater + octez-shell-libs.tezos-context-ops + octez-shell-libs.tezos-shell-context + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-protocol-updater octez-libs.tezos-stdlib-unix tezos-version.value) (flags diff --git a/src/lib_wasmer/dune b/src/lib_wasmer/dune index cc48723f707fe8dbca142c8dc94f5ddafe3c0f9c..26d49c8edbc4f196b797a7b96b7bfe2ce1cd005e 100644 --- a/src/lib_wasmer/dune +++ b/src/lib_wasmer/dune @@ -3,7 +3,7 @@ (library (name tezos_wasmer) - (public_name tezos-wasmer) + (public_name octez-l2-libs.tezos-wasmer) (instrumentation (backend bisect_ppx)) (libraries ctypes diff --git a/src/lib_wasmer/test/dune b/src/lib_wasmer/test/dune index 94a2a1623616b80fdfe56ba881cff534d0c7541b..8dca9985635bec00c7f02cd78dc8f2a4df2df997 100644 --- a/src/lib_wasmer/test/dune +++ b/src/lib_wasmer/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-wasmer + octez-l2-libs.tezos-wasmer octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -26,7 +26,7 @@ (rule (alias runtest) - (package octez-wasmer-test) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_webassembly/bin/dune b/src/lib_webassembly/bin/dune index 2ad524707c9e9f37cfb3d6bdcabb2bff96b77e12..83473b1902fecb7430d8f092c3e30358fe3f3bce 100644 --- a/src/lib_webassembly/bin/dune +++ b/src/lib_webassembly/bin/dune @@ -5,8 +5,8 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-webassembly-interpreter - tezos-webassembly-interpreter-extra + octez-l2-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter-extra lwt.unix octez-libs.tezos-tree-encoding octez-libs.tezos-lazy-containers) diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index 246eacf4d61496c324233a4a84cbc10b18d8d2e9..e38c41f08fd47a60b6797ea177a03c59824e885f 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -3,7 +3,7 @@ (library (name tezos_webassembly_interpreter) - (public_name octez-libs.tezos-webassembly-interpreter) + (public_name octez-l2-libs.tezos-webassembly-interpreter) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-lwt-result-stdlib diff --git a/src/lib_webassembly/extra/dune b/src/lib_webassembly/extra/dune index c9a71978cabea794937412bddf4cde25574d9043..ae02724ba3fb4b2cc5fef94e8fe1908198c1287c 100644 --- a/src/lib_webassembly/extra/dune +++ b/src/lib_webassembly/extra/dune @@ -3,10 +3,10 @@ (library (name tezos_webassembly_interpreter_extra) - (public_name tezos-webassembly-interpreter-extra) + (public_name octez-l2-libs.tezos-webassembly-interpreter-extra) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter lwt.unix octez-libs.tezos-lazy-containers) (flags diff --git a/src/lib_webassembly/tests/dune b/src/lib_webassembly/tests/dune index 63f2382774fd5632abf2aac9d134927d6f219739..0c6d57416a0dc5bde0ec4277dd24b238b576c0eb 100644 --- a/src/lib_webassembly/tests/dune +++ b/src/lib_webassembly/tests/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-webassembly-interpreter + octez-l2-libs.tezos-webassembly-interpreter octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -29,7 +29,7 @@ (rule (alias runtest) - (package octez-libs) + (package octez-l2-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index bc0a67623317849aaf8f3fbb6f44ba4511a2d805..be0c20aef472c5cbb98ff08dea449206c821c298 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -7,12 +7,12 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-000-Ps9mPmXa tezos-protocol-000-Ps9mPmXa.lifted octez-libs.tezos-rpc - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib-unix) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index d240d149718b335cd9ffcf0404504e53eb3d83bd..f3b8640d42bce27b66683edeb78a8ad73b1eb858 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-000-Ps9mPmXa.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_000_Ps9mPmXa)) @@ -39,8 +39,8 @@ (public_name tezos-protocol-000-Ps9mPmXa) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-000-Ps9mPmXa.raw) (flags (:standard) @@ -84,8 +84,8 @@ (public_name tezos-protocol-000-Ps9mPmXa.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-000-Ps9mPmXa) (flags (:standard) @@ -104,8 +104,8 @@ (library (name tezos_protocol_000_Ps9mPmXa_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -130,8 +130,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-000-Ps9mPmXa - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 44001073f802e283d41a9e2e26bc1569e3f9c2bb..353880e954b009919b9cc75abf25657e0f316a04 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-001-PtCJ7pwo tezos-protocol-001-PtCJ7pwo.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index 83c84f67ac65f435ea4c332c5511144d8499c60c..0e5e4f4f7a8f06387c672dce9e8b6b6fd46c5016 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-001-PtCJ7pwo - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-001-PtCJ7pwo - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-001-PtCJ7pwo.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index c7349d43bdd9552330fad04dd0e182692685f436..6ae0d2aaac912827a7f9152138a21497ac61e3c8 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-001-PtCJ7pwo.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_001_PtCJ7pwo)) @@ -106,8 +106,8 @@ (public_name tezos-protocol-001-PtCJ7pwo) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-001-PtCJ7pwo.raw) (flags (:standard) @@ -217,8 +217,8 @@ (public_name tezos-protocol-001-PtCJ7pwo.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-001-PtCJ7pwo) (flags (:standard) @@ -237,8 +237,8 @@ (library (name tezos_protocol_001_PtCJ7pwo_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -328,8 +328,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-001-PtCJ7pwo - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 5bb388a99788d8cbddd055b85936bb33aa319823..c8b9213a9c54cb122673f29d3158016a1b801de7 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-002-PsYLVpVv tezos-protocol-002-PsYLVpVv.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index 626aca5e962606bb626800a5177daa211f8adf92..a9ddd8b6055dfed38d77219c90d9b29bb5b47c88 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-002-PsYLVpVv - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-002-PsYLVpVv - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-002-PsYLVpVv.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 884659f9ccca02d8629e9604ae08226fc7300f09..6fb33ad4f3000c70a4194c78cb862cdf0372430d 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-002-PsYLVpVv.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_002_PsYLVpVv)) @@ -106,8 +106,8 @@ (public_name tezos-protocol-002-PsYLVpVv) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-002-PsYLVpVv.raw) (flags (:standard) @@ -217,8 +217,8 @@ (public_name tezos-protocol-002-PsYLVpVv.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-002-PsYLVpVv) (flags (:standard) @@ -237,8 +237,8 @@ (library (name tezos_protocol_002_PsYLVpVv_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -328,8 +328,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-002-PsYLVpVv - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 17bf5c1f3e6d9172993d5f6c91e15b0ee9fdb158..a033c9bf4ff88f4f5a9f151c8a13b6662e097dc2 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-003-PsddFKi3 tezos-protocol-003-PsddFKi3.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index 6de75bef8be303cd6b47b3893e60e93e1abd3ddb..ccd279d0efe5749ba12000533ce80f5c86f675fe 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-003-PsddFKi3 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-003-PsddFKi3 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-003-PsddFKi3.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 2e2c054deaa6396d8b6302999db9cc84a4e9dabf..f28b37ccf8275596010bf36264904be3d91b991c 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-003-PsddFKi3.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_003_PsddFKi3)) @@ -107,8 +107,8 @@ (public_name tezos-protocol-003-PsddFKi3) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-003-PsddFKi3.raw) (flags (:standard) @@ -219,8 +219,8 @@ (public_name tezos-protocol-003-PsddFKi3.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-003-PsddFKi3) (flags (:standard) @@ -239,8 +239,8 @@ (library (name tezos_protocol_003_PsddFKi3_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -331,8 +331,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-003-PsddFKi3 - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 3ba8deac382814b52e9da93e5fcc34eefd0e4816..9a280b70b341067b5f3f0f54750616d572d060a1 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-004-Pt24m4xi tezos-protocol-004-Pt24m4xi.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index 19fd467ee9a7e6344bc2746f57b44b20d556c72f..4f70f8a1f391c9d421502176390e167e32785181 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-004-Pt24m4xi - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-004-Pt24m4xi - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-004-Pt24m4xi.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 9d337fc9516279001e6e12d79812db7e51033b2b..faf6868f41e0beb816a021a61634255ad2da4121 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-004-Pt24m4xi.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_004_Pt24m4xi)) @@ -107,8 +107,8 @@ (public_name tezos-protocol-004-Pt24m4xi) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-004-Pt24m4xi.raw) (flags (:standard) @@ -219,8 +219,8 @@ (public_name tezos-protocol-004-Pt24m4xi.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-004-Pt24m4xi) (flags (:standard) @@ -239,8 +239,8 @@ (library (name tezos_protocol_004_Pt24m4xi_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -331,8 +331,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-004-Pt24m4xi - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index fc9ccc6c8247abfddbd10f03dbd2524980e25058..1cd2793108fa6f4b0ec52e87eba3ef4241e0bd1f 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-005-PsBABY5H.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_005_PsBABY5H)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-005-PsBABY5H) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBABY5H.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-005-PsBABY5H.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBABY5H) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_005_PsBABY5H_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -334,8 +334,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-005-PsBABY5H - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 27052582ebb5bbb845184996b3bb11a080c311bc..f2b73ef96af817cf539539986b83e7f27439f69f 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-005-PsBabyM1 tezos-protocol-005-PsBabyM1.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index 982bb97c4ba48e78f2aaf0f78a1418b686ddd18d..1b39d46cd9eeda92fd302c8ee3d3bd50f335e5ad 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-005-PsBabyM1 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-005-PsBabyM1 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-005-PsBabyM1.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 9949d43268c5d573f36e8264eeea41b866134951..e5b1ed909ce8c007b0eb1cb0a1a0992af64094df 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-005-PsBabyM1.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_005_PsBabyM1)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-005-PsBabyM1) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBabyM1.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-005-PsBabyM1.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBabyM1) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_005_PsBabyM1_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -334,8 +334,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-005-PsBabyM1 - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 148ca144f8ceaea7bd53d0f4d434d6faf033cccc..c563f00cf8c569db2ba4ed40ef310c375edb620c 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-006-PsCARTHA tezos-protocol-006-PsCARTHA.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends octez-libs.tezos-rpc uri) (library_flags (:standard -linkall)) diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index a338d91dbe20acf46560f063081912b7fdf1c805..795c565a7f16102199e37350787fd1c9b5e8fe07 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-006-PsCARTHA octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-006-PsCARTHA - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-006-PsCARTHA - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-006-PsCARTHA - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-006-PsCARTHA.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index de31f0e42203f3ea48800589bae1a8abd7144261..e51893c3119354420fb32490ae017f8c2fb070bc 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-006-PsCARTHA.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_006_PsCARTHA)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-006-PsCARTHA) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-006-PsCARTHA.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-006-PsCARTHA.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-006-PsCARTHA) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_006_PsCARTHA_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -334,8 +334,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-006-PsCARTHA - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (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 53640f94a0d4a4e487b1156893160b9f61ff8658..2657f1a7b1cb1e31e51d1488634b7aabdecd861d 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -7,11 +7,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-007-PsDELPH1 tezos-protocol-007-PsDELPH1.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-007-PsDELPH1 octez-libs.tezos-rpc uri) diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 40a5e44a83b83f1896574b791c400cb59be7e40d..a2588955e7ecb515a8de6f2f06801c6750172ed7 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -9,11 +9,11 @@ octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-007-PsDELPH1 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) (flags @@ -35,11 +35,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-007-PsDELPH1 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-007-PsDELPH1.commands octez-libs.tezos-rpc) (library_flags (:standard -linkall)) diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune index 477234d349099d4f8261fbb43d60fcfda17449fc..bf631d9ebf1800caab7c61d911585b20fb9b63ea 100644 --- a/src/proto_007_PsDELPH1/lib_plugin/dune +++ b/src/proto_007_PsDELPH1/lib_plugin/dune @@ -21,7 +21,7 @@ octez-libs.tezos-base tezos-embedded-protocol-007-PsDELPH1 tezos-protocol-plugin-007-PsDELPH1 - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index b2354d30517b94ab6ed53680cb19f3086d0a25a4..b032c7ee84ff2f75471adbe6746d92b2e9c696c5 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-007-PsDELPH1.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_007_PsDELPH1)) @@ -110,8 +110,8 @@ (public_name tezos-protocol-007-PsDELPH1) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-007-PsDELPH1.raw) (flags (:standard) @@ -225,8 +225,8 @@ (public_name tezos-protocol-007-PsDELPH1.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-007-PsDELPH1) (flags (:standard) @@ -245,8 +245,8 @@ (library (name tezos_protocol_007_PsDELPH1_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -340,8 +340,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-007-PsDELPH1 - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index fda20498ca32d4406f54d158e5b02f5f74c5f25d..76185dc16ab0c364317bd4edb8971a210f4c2d81 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-008-PtEdo2Zk tezos-protocol-008-PtEdo2Zk.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-008-PtEdo2Zk octez-libs.tezos-rpc uri) diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 086d6d8e82696696359f3967dfbced6cba124750..a76298f50c065a1ce623b5fd341550721c9425c5 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -10,11 +10,11 @@ octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-008-PtEdo2Zk - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc tezos-protocol-plugin-008-PtEdo2Zk) (library_flags (:standard -linkall)) @@ -39,11 +39,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-008-PtEdo2Zk - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-008-PtEdo2Zk.commands octez-libs.tezos-rpc tezos-protocol-plugin-008-PtEdo2Zk) diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune index f32a14543b8fe524c7be5bd5e802c822c36c63f2..ad6285a26c97b415ef6bd393b429980d1e1e049b 100644 --- a/src/proto_008_PtEdo2Zk/lib_plugin/dune +++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-008-PtEdo2Zk tezos-protocol-plugin-008-PtEdo2Zk - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 5d98a0f74e74aad92f01c3c9b16f625e8eed339e..0902f9654533441e076cde9b8b14f6d15efbb3a3 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-008-PtEdo2Zk.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_008_PtEdo2Zk)) @@ -115,8 +115,8 @@ (public_name tezos-protocol-008-PtEdo2Zk) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdo2Zk.raw) (flags (:standard) @@ -235,8 +235,8 @@ (public_name tezos-protocol-008-PtEdo2Zk.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdo2Zk) (flags (:standard) @@ -255,8 +255,8 @@ (library (name tezos_protocol_008_PtEdo2Zk_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -355,8 +355,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-008-PtEdo2Zk - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 9be240cc648bfb68831985faac954df97d94417b..375b1f55057d0caa5a765d07a978d630607cd06a 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-008-PtEdoTez.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_008_PtEdoTez)) @@ -115,8 +115,8 @@ (public_name tezos-protocol-008-PtEdoTez) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdoTez.raw) (flags (:standard) @@ -235,8 +235,8 @@ (public_name tezos-protocol-008-PtEdoTez.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdoTez) (flags (:standard) @@ -255,8 +255,8 @@ (library (name tezos_protocol_008_PtEdoTez_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -355,8 +355,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-008-PtEdoTez - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index 055d1f51644f7fa5cfe75a15e669e83232d180ae..8a500d0171a5aa38f063235c514010533993285d 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-009-PsFLoren tezos-protocol-009-PsFLoren.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-009-PsFLoren octez-libs.tezos-rpc uri) diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index 90a96786bb926f567c9cda654ace700c55d5d126..76137d40bf3fc49c1f76299e87f5aa8cb255cf13 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -10,13 +10,13 @@ octez-libs.tezos-clic tezos-protocol-009-PsFLoren octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-009-PsFLoren - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-009-PsFLoren) (library_flags (:standard -linkall)) (flags @@ -41,11 +41,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-009-PsFLoren - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-009-PsFLoren - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-009-PsFLoren.commands octez-libs.tezos-rpc tezos-protocol-plugin-009-PsFLoren) diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune index 373a752853e04353a5b093d6a7a6232aa5a4f0bc..17f37f0dd2d31368bed9a8ded12e16a73165880c 100644 --- a/src/proto_009_PsFLoren/lib_plugin/dune +++ b/src/proto_009_PsFLoren/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-009-PsFLoren tezos-protocol-plugin-009-PsFLoren - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index ac16d840cc4bce5d0f0202d513f188db57d17d0d..eea16a3f19a048a12532ad40dffc0b0e7ed38777 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-009-PsFLoren.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_009_PsFLoren)) @@ -118,8 +118,8 @@ (public_name tezos-protocol-009-PsFLoren) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-009-PsFLoren.raw) (flags (:standard) @@ -241,8 +241,8 @@ (public_name tezos-protocol-009-PsFLoren.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-009-PsFLoren) (flags (:standard) @@ -261,8 +261,8 @@ (library (name tezos_protocol_009_PsFLoren_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -364,8 +364,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-009-PsFLoren - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 9b3424ba64bad189ac524efd767a5b7517254755..13c8d2834060939c86046a4d98b984ded6bbbee4 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-010-PtGRANAD tezos-protocol-010-PtGRANAD.lifted - tezos-signer-backends + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-010-PtGRANAD octez-libs.tezos-rpc uri) diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index a71ce8782531ddf9d46a26fa2f66d6fa187338e2..84bc8716813c664ad33f1f42f2f4f8c610d39cfe 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -10,13 +10,13 @@ octez-libs.tezos-clic tezos-protocol-010-PtGRANAD octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-010-PtGRANAD - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-010-PtGRANAD) (library_flags (:standard -linkall)) (flags @@ -41,11 +41,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-010-PtGRANAD - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-010-PtGRANAD - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-010-PtGRANAD.commands octez-libs.tezos-rpc tezos-protocol-plugin-010-PtGRANAD) diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune index c8e0e4642a7302dd7a424d84d2c3947f94a2b5fe..55ebf7dfdece708db84e8ef8752731b2b6c7a096 100644 --- a/src/proto_010_PtGRANAD/lib_plugin/dune +++ b/src/proto_010_PtGRANAD/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-010-PtGRANAD tezos-protocol-plugin-010-PtGRANAD - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index b49429beedebebfac0a0587d8234733d0d9c3a88..66962533be82ded3f14968d8a5d16afeee5ad8d3 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-010-PtGRANAD.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_010_PtGRANAD)) @@ -123,8 +123,8 @@ (public_name tezos-protocol-010-PtGRANAD) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-010-PtGRANAD.raw) (flags (:standard) @@ -251,8 +251,8 @@ (public_name tezos-protocol-010-PtGRANAD.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-010-PtGRANAD) (flags (:standard) @@ -271,8 +271,8 @@ (library (name tezos_protocol_010_PtGRANAD_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -379,8 +379,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-010-PtGRANAD - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 80c6a9f1c702ed39c26315df4e5e53ce2c4f8de9..e34ba63a965f188c4932b6323bc11269408b1703 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-011-PtHangz2 tezos-protocol-011-PtHangz2.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-011-PtHangz2 tezos-protocol-011-PtHangz2.parameters octez-libs.tezos-rpc diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index 867dda9208d22c9532c5eba5d970336079c7ac6e..521c2adae23854ef851b5a8a56efbde33813ef3c 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -10,16 +10,16 @@ octez-libs.tezos-clic tezos-protocol-011-PtHangz2 octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-011-PtHangz2 - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-011-PtHangz2 uri) (library_flags (:standard -linkall)) @@ -45,11 +45,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-011-PtHangz2 - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-011-PtHangz2 - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-011-PtHangz2.commands tezos-client-011-PtHangz2.sapling octez-libs.tezos-rpc diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index b3c22a573185fb7cc1fd05d57cff298d3fe2c92f..3d512e487c294f687b11150807f28624adc6d040 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-011-PtHangz2 tezos-client-011-PtHangz2.commands tezos-protocol-011-PtHangz2) diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index 99a1e461b50c2b7d39368beb450342bd36cf2164..dc78d28cc7069d9ae108ea45bca813ffe3db2a5b 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-011-PtHangz2) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune index 8de65699085148d70af5075937e36a5925653e3e..624996ff19ecba71a8d96440c9b34c2a4537a665 100644 --- a/src/proto_011_PtHangz2/lib_plugin/dune +++ b/src/proto_011_PtHangz2/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-011-PtHangz2 tezos-protocol-plugin-011-PtHangz2 - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index afcf1fdb3f9ce3240e908bf7c01c30c0ad410e4a..5f1df2912b35fdb3176a048990189482c28ee9fa 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-011-PtHangz2.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_011_PtHangz2)) @@ -136,8 +136,8 @@ (public_name tezos-protocol-011-PtHangz2) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2.raw) (flags (:standard) @@ -272,8 +272,8 @@ (public_name tezos-protocol-011-PtHangz2.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2) (flags (:standard) @@ -292,8 +292,8 @@ (library (name tezos_protocol_011_PtHangz2_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -413,8 +413,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-011-PtHangz2 - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index b29571bf7379ceff941bc6d3ec190317293d370b..e59ab264156b8daa136c7ba9d2729b0ab5c3cf86 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-012-Psithaca tezos-protocol-012-Psithaca.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-012-Psithaca tezos-protocol-012-Psithaca.parameters octez-libs.tezos-rpc diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index 673b260000861e07d84e57803e8be258dd44b5f7..e665f15f706ec0128124c708b4b3b8bbb575c2ed 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -10,16 +10,16 @@ octez-libs.tezos-clic tezos-protocol-012-Psithaca octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-012-Psithaca - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-012-Psithaca uri) (library_flags (:standard -linkall)) @@ -45,11 +45,11 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-012-Psithaca - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-012-Psithaca - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-012-Psithaca.commands tezos-client-012-Psithaca.sapling octez-libs.tezos-rpc diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index d21e2fd5ce4697ccc71117be9c73b78bb18defe7..b14b7b9e826d048771641184837aa16eb2c8dfb0 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-012-Psithaca tezos-client-012-Psithaca.commands tezos-protocol-012-Psithaca) diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 22de2f0fc052bfe02f7b4d54f2750fd7a6056c86..c174ba1c14ec2c93a79e5f3a1b4c32076c3838ea 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-012-Psithaca) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune index 7b73afdc894a5df068c88daac9975fd24dc92460..eefb000a88161405f832a211e140d6b341504f07 100644 --- a/src/proto_012_Psithaca/lib_plugin/dune +++ b/src/proto_012_Psithaca/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-012-Psithaca tezos-protocol-plugin-012-Psithaca - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index dbb97194aed6e5d34ab8471b26ee1385e9fbc2bb..d0446c653f740fa94175e526ec3dd007780236f3 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-012-Psithaca.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_012_Psithaca)) @@ -153,8 +153,8 @@ (public_name tezos-protocol-012-Psithaca) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-012-Psithaca.raw) (flags (:standard) @@ -306,8 +306,8 @@ (public_name tezos-protocol-012-Psithaca.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-012-Psithaca) (flags (:standard) @@ -326,8 +326,8 @@ (library (name tezos_protocol_012_Psithaca_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -464,8 +464,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-012-Psithaca - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 85cd4d450d18541ab8fd3a0dfd32cb6e8d79bdcc..fe4d3b0993244671c4313c24e7469ef2f7f3bee7 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-013-PtJakart tezos-protocol-013-PtJakart.parameters octez-libs.tezos-rpc diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index e04869f9588677135aa18f797942e5ffab31de6f..dc9699af04a5d3ce71d172e82f797d57777ce7f3 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-013-PtJakart - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-013-PtJakart uri) (library_flags (:standard -linkall)) @@ -48,11 +48,11 @@ octez-libs.tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-013-PtJakart - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-013-PtJakart.commands tezos-client-013-PtJakart.sapling octez-libs.tezos-rpc diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index d62537b040495f89f0213979d591d147233e10c4..be94eede52c4d728fd707ad738c6aeba49249d6b 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-013-PtJakart tezos-client-013-PtJakart.commands tezos-protocol-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 791a6a5c2888e1486f5ef86d84345b42b075246d..ae07fac39cc789f7aae0b67def0ae6653e7dd494 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-013-PtJakart) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune index 551c150ebd63577c38045bb6cbacbcdc72ccbef3..2d9e07267e67d49617cf211a72189b8cd11dcd10 100644 --- a/src/proto_013_PtJakart/lib_plugin/dune +++ b/src/proto_013_PtJakart/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index a8ed057f1bb60814867f161b323b3aae5f0dcaf3..350a98db0061475adcbdd88e796383414f9442d3 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-013-PtJakart.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_013_PtJakart)) @@ -218,8 +218,8 @@ (public_name tezos-protocol-013-PtJakart) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-013-PtJakart.raw) (flags (:standard) @@ -437,8 +437,8 @@ (public_name tezos-protocol-013-PtJakart.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-013-PtJakart) (flags (:standard) @@ -457,8 +457,8 @@ (library (name tezos_protocol_013_PtJakart_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -661,8 +661,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-013-PtJakart - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index a27221fb0e508d6276065bba1056d25f32afcf3c..f1b4fad218d9f88c1b6534b85f46595a98db0475 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-014-PtKathma tezos-protocol-014-PtKathma.parameters octez-libs.tezos-rpc diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index 61e539f20c7c8677b84d6b4afb5a1e6f911df327..ab549052cc318860fd132e32e23cc5324f5d3d38 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-014-PtKathma - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-014-PtKathma uri) (library_flags (:standard -linkall)) @@ -48,11 +48,11 @@ octez-libs.tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-014-PtKathma - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-014-PtKathma.commands tezos-client-014-PtKathma.sapling octez-libs.tezos-rpc diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index 84700fa1ae4f889b5970502fa72e223882d7e0a9..89b90b0bd77aff6c5927701a1f702bbbc2a4a0d7 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-014-PtKathma tezos-client-014-PtKathma.commands tezos-protocol-014-PtKathma diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index f81466eded4bbfe459739ab4ba2ded240a9fa6b4..da92bd7404e9b502d96f2179f2e3a8212dedd2db 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-014-PtKathma) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_plugin/dune b/src/proto_014_PtKathma/lib_plugin/dune index 62ff69e491ada03f0e889983f0046234078e18b1..fbeb8bc8aa15c082fd7b9f98fed55f3bc662bf7f 100644 --- a/src/proto_014_PtKathma/lib_plugin/dune +++ b/src/proto_014_PtKathma/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-014-PtKathma tezos-protocol-plugin-014-PtKathma - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune index 596711949d6f26391d32fca13d2580a4249d1408..13b7569603f662a292a87ae1d75f1b2e3a62826a 100644 --- a/src/proto_014_PtKathma/lib_protocol/dune +++ b/src/proto_014_PtKathma/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-014-PtKathma.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_014_PtKathma)) @@ -241,8 +241,8 @@ (public_name tezos-protocol-014-PtKathma) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-014-PtKathma.raw) (flags (:standard) @@ -484,8 +484,8 @@ (public_name tezos-protocol-014-PtKathma.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-014-PtKathma) (flags (:standard) @@ -503,8 +503,8 @@ (library (name tezos_protocol_014_PtKathma_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -731,8 +731,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-014-PtKathma - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index ad2ca11d6ace31324475455d65c3f8f48a5ef3dc..2338222d504cafdf787618e339055d8df1c42a53 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-rpc diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune index bbc97162cc67aeff5a5db27512c2417659c60766..b8fcf38eccfa273607446d689af4d6632b067631 100644 --- a/src/proto_015_PtLimaPt/lib_client_commands/dune +++ b/src/proto_015_PtLimaPt/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-015-PtLimaPt - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-015-PtLimaPt uri) (library_flags (:standard -linkall)) @@ -47,11 +47,11 @@ octez-libs.tezos-clic tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-015-PtLimaPt - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-015-PtLimaPt.commands tezos-client-015-PtLimaPt.sapling octez-libs.tezos-rpc diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune index cf26b963080e3ab679cd12b8bc73112950a3c8b1..c831e8a55974db2bc5bff25ecdc61a0c4d6d323d 100644 --- a/src/proto_015_PtLimaPt/lib_client_sapling/dune +++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-015-PtLimaPt tezos-client-015-PtLimaPt.commands tezos-protocol-015-PtLimaPt diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index 218b5d2276aa73c6149be82d45be13686e3ffd47..b15a3a6a56a3f282af3b0c6b3ecfe0f65d91df27 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-015-PtLimaPt) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_015_PtLimaPt/lib_plugin/dune b/src/proto_015_PtLimaPt/lib_plugin/dune index b0b9b2e47e2120c9592a40cb82bcb746b4fd32bd..a37e67e963fd5068e7d61b402b9d036979ee0610 100644 --- a/src/proto_015_PtLimaPt/lib_plugin/dune +++ b/src/proto_015_PtLimaPt/lib_plugin/dune @@ -23,7 +23,7 @@ octez-libs.tezos-base tezos-embedded-protocol-015-PtLimaPt tezos-protocol-plugin-015-PtLimaPt - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/dune b/src/proto_015_PtLimaPt/lib_protocol/dune index 2864672c198d95936cf1cf780bd96c87854a27b1..1dfdecbcea436273bfd517482002335c8e447927 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-015-PtLimaPt.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_015_PtLimaPt)) @@ -265,8 +265,8 @@ (public_name tezos-protocol-015-PtLimaPt) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-015-PtLimaPt.raw) (flags (:standard) @@ -533,8 +533,8 @@ (public_name tezos-protocol-015-PtLimaPt.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-015-PtLimaPt) (flags (:standard) @@ -552,8 +552,8 @@ (library (name tezos_protocol_015_PtLimaPt_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -805,8 +805,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-015-PtLimaPt - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index 95671d31e05f5c5f08853c58cc20018e339e733b..2f0f1b0bc06e38e11b3ae26e66f6fc69ceb9929d 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-016-PtMumbai tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-rpc diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune index 6a4d5e8089c351f8e1fc8a36305f424ac632927f..20b13f7980551838adff47c890d423f8eb3eda18 100644 --- a/src/proto_016_PtMumbai/lib_client_commands/dune +++ b/src/proto_016_PtMumbai/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-016-PtMumbai - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-016-PtMumbai uri) (library_flags (:standard -linkall)) @@ -47,11 +47,11 @@ octez-libs.tezos-clic tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-016-PtMumbai - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-016-PtMumbai.commands tezos-client-016-PtMumbai.sapling octez-libs.tezos-rpc diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune index acbe8d47a02d7fc1ea5b43d3a0df128e7aac65a5..214228ce4ba46c4250449503692483ae6f594f37 100644 --- a/src/proto_016_PtMumbai/lib_client_sapling/dune +++ b/src/proto_016_PtMumbai/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-016-PtMumbai tezos-client-016-PtMumbai.commands tezos-protocol-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index d86489e6d6741a4ae4d6ee141502b136591cc930..83bb0b22899716d2a993e47d98b791f455f546c8 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-016-PtMumbai) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_plugin/dune b/src/proto_016_PtMumbai/lib_plugin/dune index dfa6e7a37a083a6699120f8f72e62715023e7040..811909d227fd3ae793e7de09e68b4881c2e4607c 100644 --- a/src/proto_016_PtMumbai/lib_plugin/dune +++ b/src/proto_016_PtMumbai/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-016-PtMumbai tezos-protocol-plugin-016-PtMumbai - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/dune b/src/proto_016_PtMumbai/lib_protocol/dune index 279fb749c9d6e72e1d318300e964a43ca1ca857a..02a7939657010469a9d946a0acc815b1eea20196 100644 --- a/src/proto_016_PtMumbai/lib_protocol/dune +++ b/src/proto_016_PtMumbai/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-016-PtMumbai.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_016_PtMumbai)) @@ -281,8 +281,8 @@ (public_name tezos-protocol-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-016-PtMumbai.raw) (flags (:standard) @@ -567,8 +567,8 @@ (public_name tezos-protocol-016-PtMumbai.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-016-PtMumbai) (flags (:standard) @@ -586,8 +586,8 @@ (library (name tezos_protocol_016_PtMumbai_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -857,8 +857,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-016-PtMumbai - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune index 320d927f5ffb96ea697dc4c0ad1120a8cf6c4f82..df9674cc9c56b9119844804cf5a5cb87d674fc30 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-016-PtMumbai octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune index 81bfdb52f33781e7c036e2e696e67cdca8e2f3b8..e8607a44ed9ccdb35f32f513e8f372d29c1c8163 100644 --- a/src/proto_017_PtNairob/bin_accuser/dune +++ b/src/proto_017_PtNairob/bin_accuser/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune index 028186ff7290c9b19a429c45277ffb89dd59b44d..226c71e211706071998651832eae989ae362063f 100644 --- a/src/proto_017_PtNairob/bin_baker/dune +++ b/src/proto_017_PtNairob/bin_baker/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_017_PtNairob/bin_sc_rollup_node/dune b/src/proto_017_PtNairob/bin_sc_rollup_node/dune index 7f2b3df73f1c00a95369d4b590577b22ded520a9..ae61acd9e0be7c138faa065a8ec57320a52f3066 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune @@ -10,10 +10,10 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-017-PtNairob - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands tezos-client-017-PtNairob octez-smart-rollup-node-lib octez_smart_rollup_node_PtNairob) diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune index a2367fbccc485dba711025bba2c891c2961c5a8c..165abfc0fb28060f0e212c5cf1d705039ea56566 100644 --- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune +++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune @@ -17,13 +17,13 @@ tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob octez-libs.tezos-crypto - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks octez-libs.tezos-micheline tezos-017-PtNairob-test-helpers octez-libs.tezos-sapling tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index e433969ebab93707c8bcf493d5bf579ccaf96116..4dc05bc19f7f65b33402bc35b739cf9bf48512e0 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-017-PtNairob tezos-protocol-017-PtNairob.parameters octez-libs.tezos-rpc diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune index d7630d672743a61b598748a0f20765e95a7cd038..c180b07ccb39e52004589ae20a8e981d20855e94 100644 --- a/src/proto_017_PtNairob/lib_client_commands/dune +++ b/src/proto_017_PtNairob/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-017-PtNairob uri) (library_flags (:standard -linkall)) @@ -47,11 +47,11 @@ octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-017-PtNairob.commands tezos-client-017-PtNairob.sapling octez-libs.tezos-rpc diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune index cc2542332f3d58cab6ada8418963ea6c4a4eaba5..0a4c530d8fb374b96d49be80487aabfa42f1cbce 100644 --- a/src/proto_017_PtNairob/lib_client_sapling/dune +++ b/src/proto_017_PtNairob/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-017-PtNairob tezos-client-017-PtNairob.commands tezos-protocol-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index bb5e7920b3b91ff37142e768ff8cbdf22979750e..815bae76079a81d7a86b79cdf93f360823bb3fde 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -11,18 +11,18 @@ tezos-version.value tezos-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix - tezos-context-ops + octez-shell-libs.tezos-context-ops octez-libs.tezos-rpc octez-libs.tezos-rpc-http tezos-dal-node-services @@ -56,11 +56,11 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob octez-libs.tezos-rpc uri) @@ -85,11 +85,11 @@ (libraries octez-libs.tezos-base tezos-protocol-017-PtNairob - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob tezos-baking-017-PtNairob-commands octez-libs.tezos-rpc) diff --git a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune index e2dba049aa2c060ce522e260580d0afc786b4ac7..18efa4dcc847479388feb4a19eaa9fe1802569d6 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune @@ -8,14 +8,14 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob tezos-client-017-PtNairob - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-017-PtNairob octez-libs.tezos-stdlib-unix - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-017-PtNairob.parameters - tezos-mockup - tezos-mockup-proxy - tezos-mockup-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-proxy + octez-shell-libs.tezos-mockup-commands tezos-baking-017-PtNairob.tenderbrute) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune index 46d46e8f3c94bf8c798afe5b258b2c36d1d50daa..d276d1ebbf822f6476e198fe0f12250f24c2b22c 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune @@ -5,7 +5,7 @@ (name tenderbrute_main) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob tezos-protocol-017-PtNairob tezos-baking-017-PtNairob.tenderbrute) diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune index 63083e2769f2ffcb3ebe184aeddd987ff3750672..98f3afed4d73fab076c6a24d70963144d1ec91fb 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-protocol-017-PtNairob - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-017-PtNairob) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune index bdc1290e9a0e9dae638ba86189129fb7d0be9753..b1c3fb782bb2450d9fa0d81649fe856e332ec4fa 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-017-PtNairob) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_plugin/dune b/src/proto_017_PtNairob/lib_plugin/dune index 385dd6af7b909c1c560e51249db0f91d2b3799b7..e76a6acbd53436eb3dd0a54861ac1e3cd40bdd56 100644 --- a/src/proto_017_PtNairob/lib_plugin/dune +++ b/src/proto_017_PtNairob/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_017_PtNairob/lib_protocol/dune b/src/proto_017_PtNairob/lib_protocol/dune index 66b530842afee64a45999d21e368b94ace76c652..34fc3df80d687bb3a8bb7e6151156b1be0eeaa9d 100644 --- a/src/proto_017_PtNairob/lib_protocol/dune +++ b/src/proto_017_PtNairob/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-017-PtNairob.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_017_PtNairob)) @@ -284,8 +284,8 @@ (public_name tezos-protocol-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-017-PtNairob.raw) (flags (:standard) @@ -573,8 +573,8 @@ (public_name tezos-protocol-017-PtNairob.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-017-PtNairob) (flags (:standard) @@ -592,8 +592,8 @@ (library (name tezos_protocol_017_PtNairob_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -866,8 +866,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-017-PtNairob - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune index 9e9a9730c9611b9fdb4f09545ad87a561d74700d..819c724803be625b1b8bb6d4bbc1e8f207a15483 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune @@ -14,9 +14,9 @@ tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-plugin-017-PtNairob - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler octez-libs.tezos-crypto-dal) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune index ddb3b27992a0315510aa04d688ed3a3c82dc5a67..f0fee8ae0d69c3653615c7669a53b885057f8fe7 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezt-tezos + tezt-tezos tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index 06c137a20c6c51934a8eb9b6235d18cb779d47db..ce351a0bb733db64320b0e31bac2d36c22fefdc0 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -10,19 +10,19 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-micheline tezos-client-017-PtNairob - tezos-client-base + octez-shell-libs.tezos-client-base tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-017-PtNairob octez-libs.tezos-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - octez-libs.tezos-scoru-wasm - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune index 3211b998ae2c568e0db4c5c04eedcca8698f4205..3e4d8be00aedec7c40e963d149e61d94f27765e8 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base tezos-protocol-017-PtNairob - tezos-client-commands - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-017-PtNairob - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-017-PtNairob tezos-smart-rollup-layer2-017-PtNairob) (flags diff --git a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune index 384b8f99ecf726c7d014966a67809ac300818d5e..e9beac4bda1815a75e7b6449f5b60908452301b2 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index 294c711217ff85d434b7476a0106b5255f123507..cb3f37b2d77942e9681d32f700b8a7643405c48d 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-017-PtNairob octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers @@ -23,12 +23,12 @@ tezos-dal-node-services tezos-dal-node-lib tezos-dac-lib - octez-libs.tezos-shell-services - octez-smart-rollup + octez-shell-libs.tezos-shell-services + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-017-PtNairob tezos-smart-rollup-layer2-017-PtNairob tezos-layer2-utils-017-PtNairob - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-tree-encoding data-encoding @@ -39,8 +39,8 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) (flags diff --git a/src/proto_018_Proxford/bin_accuser/dune b/src/proto_018_Proxford/bin_accuser/dune index 06c519aed0873b9a008784fac901c3bd7ca1b968..31fb64128443441269ef92207c51f23d99ce97c9 100644 --- a/src/proto_018_Proxford/bin_accuser/dune +++ b/src/proto_018_Proxford/bin_accuser/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune index bc5a89bb1dddd743338b61301723b6e96e23d47a..07fa75445586b0aad9dab83bbe657e6f2cb47712 100644 --- a/src/proto_018_Proxford/bin_baker/dune +++ b/src/proto_018_Proxford/bin_baker/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_018_Proxford/bin_sc_rollup_node/dune b/src/proto_018_Proxford/bin_sc_rollup_node/dune index 4101d382502f3e0b7416aedf316ae43cd269ef66..2c32e311bf41b46d1aa2c45208a22a5772e613e0 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_node/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune @@ -10,10 +10,10 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-018-Proxford - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands tezos-client-018-Proxford octez-smart-rollup-node-lib octez_smart_rollup_node_Proxford) diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune index 5edb12823f39bbfead83874ae53ef6e653a3cc0e..200328e3b934b54ae67cd294b0031fcc316bd3fa 100644 --- a/src/proto_018_Proxford/lib_benchmarks_proto/dune +++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune @@ -17,13 +17,13 @@ tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford octez-libs.tezos-crypto - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks octez-libs.tezos-micheline tezos-018-Proxford-test-helpers octez-libs.tezos-sapling tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune index d59d56191dc63eb312fae89e5250996fd91a9d99..951f1b12dbf41a70683fc0dca2645adfc57292c6 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-rpc diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune index d5967eb47986f968e5e9dd4c4bd93a376105fdbd..6d36d8359145ab5c72c4ce7b973898445b1873d0 100644 --- a/src/proto_018_Proxford/lib_client_commands/dune +++ b/src/proto_018_Proxford/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-018-Proxford uri) (library_flags (:standard -linkall)) @@ -47,11 +47,11 @@ octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-018-Proxford.commands tezos-client-018-Proxford.sapling octez-libs.tezos-rpc diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune index 2936cda3a0f1b154a8a16fc09b7db78ce6df9ed1..27cdc3ab74f39908fb6c9bc8cfe73fa99bb4f017 100644 --- a/src/proto_018_Proxford/lib_client_sapling/dune +++ b/src/proto_018_Proxford/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-018-Proxford tezos-client-018-Proxford.commands tezos-protocol-018-Proxford diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index 24cf1a414457f53adce4b2cb1fb76af0fe99aad8..9758f854351e3e5e2d30fcc42cf67c53138df74a 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -12,18 +12,18 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted tezos-protocol-plugin-018-Proxford - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix - tezos-context-ops + octez-shell-libs.tezos-context-ops octez-libs.tezos-rpc octez-libs.tezos-rpc-http tezos-dal-node-services @@ -59,11 +59,11 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford octez-libs.tezos-rpc uri) @@ -89,11 +89,11 @@ (libraries octez-libs.tezos-base tezos-protocol-018-Proxford - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford tezos-baking-018-Proxford-commands octez-libs.tezos-rpc) diff --git a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune index f439baacf9ebf8abe36d00bff4462e4e35636402..a0ae63f100443dac0282e2c7c8fab2ad5c656ddc 100644 --- a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune @@ -8,14 +8,14 @@ octez-libs.tezos-base tezos-protocol-018-Proxford tezos-client-018-Proxford - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-018-Proxford octez-libs.tezos-stdlib-unix - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-018-Proxford.parameters - tezos-mockup - tezos-mockup-proxy - tezos-mockup-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-proxy + octez-shell-libs.tezos-mockup-commands tezos-baking-018-Proxford.tenderbrute) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune index cb41047c4c68e31876e6697ec7b1650034f37682..6d38d37d65cff72e92ed0b019319652a3c541973 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune @@ -5,7 +5,7 @@ (name tenderbrute_main) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-018-Proxford tezos-protocol-018-Proxford tezos-baking-018-Proxford.tenderbrute) diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune index 44af16dfcc4b4d81f8070662758724be88e56498..b274c96c2ab2ab996297a1ac6ce69252767c512c 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-protocol-018-Proxford - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-018-Proxford) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune index f452e1bb27a516d4796e4478f886c55f3849a1ab..3c87ad8197e91a38fcac3be34ca57d253752d9bb 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-018-Proxford) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_plugin/dune b/src/proto_018_Proxford/lib_plugin/dune index ceb7ffeed6d7e399f140d5c02058c63aba3779b6..92efc10f00fad20704c82c1bca6043e3045f047e 100644 --- a/src/proto_018_Proxford/lib_plugin/dune +++ b/src/proto_018_Proxford/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-018-Proxford tezos-protocol-plugin-018-Proxford - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_018_Proxford/lib_protocol/dune b/src/proto_018_Proxford/lib_protocol/dune index 4e63afed92f3a4f05e3fc94552426861eb6b0bdc..2bdbf3ee5aaa091c4a04d8fa5c7b0f6e5311af73 100644 --- a/src/proto_018_Proxford/lib_protocol/dune +++ b/src/proto_018_Proxford/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-018-Proxford.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_018_Proxford)) @@ -270,8 +270,8 @@ (public_name tezos-protocol-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-018-Proxford.raw) (flags (:standard) @@ -544,8 +544,8 @@ (public_name tezos-protocol-018-Proxford.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-018-Proxford) (flags (:standard) @@ -563,8 +563,8 @@ (library (name tezos_protocol_018_Proxford_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -822,8 +822,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-018-Proxford - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune index c9283e9c1ba45700074dc5333d4159df31abbd9e..2ffd631e71f544f4544aa697d624ed8494181dab 100644 --- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune +++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune @@ -14,9 +14,9 @@ tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-018-Proxford.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-plugin-018-Proxford - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler octez-libs.tezos-crypto-dal tezos-smart-rollup-018-Proxford) diff --git a/src/proto_018_Proxford/lib_protocol/test/regression/dune b/src/proto_018_Proxford/lib_protocol/test/regression/dune index 7206fdc257310b5f8ea442473b04683de806ed3e..b317785353be15739fc013ccd95dfa825631455f 100644 --- a/src/proto_018_Proxford/lib_protocol/test/regression/dune +++ b/src/proto_018_Proxford/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezt-tezos + tezt-tezos tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index 2516128f91538a86047dfd274c318258f3a64c8d..e36b5ddf011fe8374664ecf3fc541970520ce159 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -10,19 +10,19 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-micheline tezos-client-018-Proxford - tezos-client-base + octez-shell-libs.tezos-client-base tezos-protocol-018-Proxford.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-018-Proxford octez-libs.tezos-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - octez-libs.tezos-scoru-wasm - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune index c56f99618df65123c4b2c2a4c29fe2fafb470245..4568d24484658ef312e6944ffcd0456483dfe9f1 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_client/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base tezos-protocol-018-Proxford - tezos-client-commands - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-018-Proxford - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-018-Proxford tezos-smart-rollup-layer2-018-Proxford) (flags diff --git a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune index 07dc22f9a1c9dd92a00098bd28498f4f6b5bd2aa..633cca408229688850caa0881fb1bc0533a8eb31 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-018-Proxford octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index abb96dbe932b396131bcd3075689568058433cf7..ef5b51e5c48a845e4fe2c1a3369e94ec7e0c406f 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-018-Proxford octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers @@ -25,12 +25,12 @@ tezos-dac-018-Proxford tezos-dac-lib tezos-dac-client-lib - octez-libs.tezos-shell-services - octez-smart-rollup + octez-shell-libs.tezos-shell-services + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-018-Proxford tezos-smart-rollup-layer2-018-Proxford tezos-layer2-utils-018-Proxford - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-tree-encoding data-encoding @@ -41,8 +41,8 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) (flags diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 4252519bda432b918e754d8dadda42a7a3a46ee4..642fcd2b898e2e535a0e07b12bd2e5aa62b2fc2c 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-alpha tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 29624ddf49d22d318b006c507944d8ed46ba172e..489c98254af266b13cb314eaf9f81e2f2a3d745b 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -11,10 +11,10 @@ octez-libs.tezos-clic tezos-protocol-alpha tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha-commands octez-libs.tezos-stdlib-unix - tezos-client-base-unix) + octez-shell-libs.tezos-client-base-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 9c74d1dc4c404b710c4705c7b15bbeea4cfff4cb..3baeeea0ec852d8661e5bb6577c596c47ed8bad1 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -10,10 +10,10 @@ octez-libs.tezos-base octez-libs.tezos-clic tezos-protocol-alpha - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-base-unix - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix + octez-shell-libs.tezos-client-commands tezos-client-alpha octez-smart-rollup-node-lib octez_smart_rollup_node_alpha) diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 8f9a0936e77649f1e7636ab9da28144f054d9243..64e99fa8e915c1e97721cd7fe55fcfa8fe99b4d6 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -17,13 +17,13 @@ tezos-benchmark-type-inference-alpha tezos-protocol-alpha octez-libs.tezos-crypto - tezos-shell-benchmarks + octez-shell-libs.tezos-shell-benchmarks octez-libs.tezos-micheline tezos-alpha-test-helpers octez-libs.tezos-sapling tezos-client-alpha tezos-protocol-plugin-alpha - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 3c2a74fbd91337554621156094fdd4051f47ef8b..cc9a6445d7fb038447702355816e747740020f17 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -8,13 +8,13 @@ (libraries octez-libs.tezos-base octez-libs.tezos-clic - octez-libs.tezos-shell-services - tezos-client-base + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-protocol-alpha tezos-protocol-alpha.lifted - tezos-mockup-registration - tezos-proxy - tezos-signer-backends + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-proxy + octez-shell-libs.tezos-signer-backends tezos-protocol-plugin-alpha tezos-protocol-alpha.parameters octez-libs.tezos-rpc diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 226e8ca7a0cc919679eb82b71085ee9bbdcdd665..3c6ff7e599312d495867bfbc19f1e6e35ef6bf75 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -11,16 +11,16 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-mockup - tezos-mockup-registration - tezos-mockup-commands - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-registration + octez-shell-libs.tezos-mockup-commands + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-rpc - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-plugin-alpha uri) (library_flags (:standard -linkall)) @@ -47,11 +47,11 @@ octez-libs.tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-client-alpha.commands tezos-client-alpha.sapling octez-libs.tezos-rpc diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 51d616311ba221dbb2f544ad563082bd45d01ca6..6451985346bc71c36879f9def60e144723c3393b 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -10,8 +10,8 @@ octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-signer-backends + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-signer-backends tezos-client-alpha tezos-client-alpha.commands tezos-protocol-alpha diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 46f5443642a0c0527c16549456c50e3ff42f6a57..a98c5bd6a84195bc7fff79a51303ea0f8ffc1f8f 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -12,18 +12,18 @@ tezos-protocol-alpha tezos-protocol-alpha.lifted tezos-protocol-plugin-alpha - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - octez-libs.tezos-shell-context + octez-shell-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix - tezos-context-ops + octez-shell-libs.tezos-context-ops octez-libs.tezos-rpc octez-libs.tezos-rpc-http tezos-dal-node-services @@ -59,11 +59,11 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha octez-libs.tezos-rpc uri) @@ -89,11 +89,11 @@ (libraries octez-libs.tezos-base tezos-protocol-alpha - octez-libs.tezos-protocol-environment - octez-libs.tezos-shell-services - tezos-client-base + octez-proto-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha tezos-baking-alpha-commands octez-libs.tezos-rpc) diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune index fd23a70fc9d31f5e978ebe27ee470bd950afa3b5..7d1e5d0fd582185b57dbb6181b848da646993743 100644 --- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune @@ -8,14 +8,14 @@ octez-libs.tezos-base tezos-protocol-alpha tezos-client-alpha - tezos-client-commands + octez-shell-libs.tezos-client-commands tezos-baking-alpha octez-libs.tezos-stdlib-unix - tezos-client-base-unix + octez-shell-libs.tezos-client-base-unix tezos-protocol-alpha.parameters - tezos-mockup - tezos-mockup-proxy - tezos-mockup-commands + octez-shell-libs.tezos-mockup + octez-shell-libs.tezos-mockup-proxy + octez-shell-libs.tezos-mockup-commands tezos-baking-alpha.tenderbrute) (flags (:standard) diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index a3884ee08c60af47276e05546ad60c6cabec0621..5e79a992f70fad838e4fcf1c23d8380178907ea0 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -5,7 +5,7 @@ (name tenderbrute_main) (libraries octez-libs.tezos-base - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-alpha tezos-protocol-alpha tezos-baking-alpha.tenderbrute) diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune index 3c7271584e3a8c6101ea595c12c3b8e09e13017a..375cd3bbe22629e1ecdb9ca8f30542823ff80d01 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-protocol-alpha - tezos-client-base + octez-shell-libs.tezos-client-base tezos-client-alpha) (flags (:standard) diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index cd06bb6d21df450b2f65696e4f16143aba0ba3e2..557caeb2ae48f508ab6885ef210c39fe50138716 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune index 674a18ac17dd39c07812bc8fe9ec2941ccb8f0db..de780c0a1f3d7de942c750e1519895f22effac3f 100644 --- a/src/proto_alpha/lib_plugin/dune +++ b/src/proto_alpha/lib_plugin/dune @@ -25,7 +25,7 @@ octez-libs.tezos-base tezos-embedded-protocol-alpha tezos-protocol-plugin-alpha - tezos-validation) + octez-shell-libs.tezos-validation) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index a5405493d29f56334ff78c5ef90dcd4488586107..2d453d22e7d6409b4b9331a328d06e9374156892 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-alpha.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_alpha)) @@ -275,8 +275,8 @@ (public_name tezos-protocol-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-alpha.raw) (flags (:standard) @@ -554,8 +554,8 @@ (public_name tezos-protocol-alpha.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-alpha) (flags (:standard) @@ -573,8 +573,8 @@ (library (name tezos_protocol_alpha_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -837,8 +837,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-alpha - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index ec730e07e8bec73e15c94953401afbaf936827ad..362798adf06b215aac2bbc1820be5fa9683b842d 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -14,9 +14,9 @@ tezos-protocol-alpha tezos-client-alpha tezos-protocol-alpha.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment tezos-protocol-plugin-alpha - octez-libs.tezos-shell-services + octez-shell-libs.tezos-shell-services octez-libs.octez-plompiler octez-libs.tezos-crypto-dal tezos-smart-rollup-alpha) diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index 56c4c7b779f55a09660ec08c4cc5c7680e1bca35..308866588f54477f98b4afb4e6d0144c1b8fc2d7 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-base - octez-libs.tezt-tezos + tezt-tezos tezos-protocol-alpha tezos-client-alpha tezos-protocol-plugin-alpha diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 045e978788f8da380bd26acd76ae7ce5862c4e49..a901c13cb0a8c6c99b6e8a385d0911d91cfd917c 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -10,19 +10,19 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-micheline tezos-client-alpha - tezos-client-base + octez-shell-libs.tezos-client-base tezos-protocol-alpha.parameters - octez-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-alpha octez-libs.tezos-test-helpers tezos-alpha-test-helpers octez-alcotezt - tezos-scoru-wasm-helpers + octez-l2-libs.tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - octez-libs.tezos-scoru-wasm - tezos-webassembly-interpreter-extra) + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune index 7114cd3b104c718ac4fe090e061133cc579117e6..880c6b25eabaa6f432c18fa14121f9b4122dc8c6 100644 --- a/src/proto_alpha/lib_sc_rollup_client/dune +++ b/src/proto_alpha/lib_sc_rollup_client/dune @@ -8,11 +8,11 @@ (libraries octez-libs.tezos-base tezos-protocol-alpha - tezos-client-commands - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-alpha - octez-smart-rollup + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-alpha tezos-smart-rollup-layer2-alpha) (flags diff --git a/src/proto_alpha/lib_sc_rollup_layer2/dune b/src/proto_alpha/lib_sc_rollup_layer2/dune index faf0ccf31e76e78615f5b5af827574c281dbf982..a5cb13ec097c117ac88de0b9ef1999e4fc580d71 100644 --- a/src/proto_alpha/lib_sc_rollup_layer2/dune +++ b/src/proto_alpha/lib_sc_rollup_layer2/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-protocol-alpha octez-injector - octez-smart-rollup) + octez-l2-libs.octez-smart-rollup) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index 6dbe071ff92fab5f8a5d0fa0aaee3058836c2dd8..228c5a00d342ce84e9550f2c600d83f68f2c076b 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-stdlib-unix - tezos-client-base - tezos-client-base-unix + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-base-unix tezos-client-alpha octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers @@ -25,12 +25,12 @@ tezos-dac-alpha tezos-dac-lib tezos-dac-client-lib - octez-libs.tezos-shell-services - octez-smart-rollup + octez-shell-libs.tezos-shell-services + octez-l2-libs.octez-smart-rollup tezos-smart-rollup-alpha tezos-smart-rollup-layer2-alpha tezos-layer2-utils-alpha - tezos_layer2_store + octez-l2-libs.tezos_layer2_store octez-crawler octez-libs.tezos-tree-encoding data-encoding @@ -41,8 +41,8 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - octez-libs.tezos-scoru-wasm - tezos-scoru-wasm-fast + octez-l2-libs.tezos-scoru-wasm + octez-l2-libs.tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) (flags diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune index d7c0f62b6b3e0d2059c62953e7612ba2c663cd66..d65577d83c807fc796698edfb586b727925ae57f 100644 --- a/src/proto_demo_counter/lib_client/dune +++ b/src/proto_demo_counter/lib_client/dune @@ -7,9 +7,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-shell-services - tezos-client-base - tezos-client-commands + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-shell-libs.tezos-client-commands tezos-protocol-demo-counter tezos-protocol-demo-counter.lifted) (library_flags (:standard -linkall)) diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index a6bfd1d55de3c280930ceabfd130e740ebaa6fb1..337dea6ef032a94c19de1e38ba59d686c8217e61 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-demo-counter.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_demo_counter)) @@ -47,8 +47,8 @@ (public_name tezos-protocol-demo-counter) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-counter.raw) (flags (:standard) @@ -94,8 +94,8 @@ (public_name tezos-protocol-demo-counter.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-counter) (flags (:standard) @@ -113,8 +113,8 @@ (library (name tezos_protocol_demo_counter_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -145,8 +145,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-demo-counter - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index f25653c71359bf2a0e2c4fc64be734fdd1e95351..2127225ab5b5145d7c481452a5626650a786b39e 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-demo-noops.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_demo_noops)) @@ -38,8 +38,8 @@ (public_name tezos-protocol-demo-noops) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-noops.raw) (flags (:standard) @@ -75,8 +75,8 @@ (public_name tezos-protocol-demo-noops.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-demo-noops) (flags (:standard) @@ -94,8 +94,8 @@ (library (name tezos_protocol_demo_noops_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -117,8 +117,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-demo-noops - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index fb9b30da4665383ddad4f2951fa509f54f9a5e55..83b1e3b4fb44ce120f5e8fefbb379837e3f08a08 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -7,13 +7,13 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - octez-libs.tezos-shell-services - tezos-client-base - octez-libs.tezos-protocol-environment + octez-shell-libs.tezos-shell-services + octez-shell-libs.tezos-client-base + octez-proto-libs.tezos-protocol-environment tezos-protocol-genesis tezos-protocol-genesis.lifted - tezos-client-commands - tezos-proxy + octez-shell-libs.tezos-client-commands + octez-shell-libs.tezos-proxy octez-libs.tezos-stdlib-unix) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index b5e824ea8e02269d0995a8108af06502d5107660..cb6c21b2aa0134fbcad3ea53aa5ec76a492af2e0 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-genesis.environment) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment) + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_genesis)) @@ -38,8 +38,8 @@ (public_name tezos-protocol-genesis) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-genesis.raw) (flags (:standard) @@ -77,8 +77,8 @@ (public_name tezos-protocol-genesis.lifted) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs tezos-protocol-genesis) (flags (:standard) @@ -96,8 +96,8 @@ (library (name tezos_protocol_genesis_functor) (libraries - octez-libs.tezos-protocol-environment - octez-libs.tezos-protocol-environment.sigs) + octez-proto-libs.tezos-protocol-environment + octez-proto-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -121,8 +121,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-genesis - tezos-protocol-updater - octez-libs.tezos-protocol-environment) + octez-shell-libs.tezos-protocol-updater + octez-proto-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/tezt/lib_ethereum/dune b/tezt/lib_ethereum/dune index cf174fa6fb9718bd51344438544b6a80aad4fa66..8efa3ebbffc211676da3688a752eb120a1abb5b7 100644 --- a/tezt/lib_ethereum/dune +++ b/tezt/lib_ethereum/dune @@ -6,9 +6,9 @@ (package tezt-ethereum) (libraries tezt - octez-libs.tezt-performance-regression) + tezt-tezos.tezt-performance-regression) (flags (:standard) -open Tezt -open Tezt.Base - -open Tezt_performance_regression)) + -open Tezt_tezos_tezt_performance_regression)) diff --git a/tezt/lib_performance_regression/dune b/tezt/lib_performance_regression/dune index fb6ff512def605112da43635b63dd3b47aec4d88..dc272e706ac38764ad242694193a94cc932fd3fc 100644 --- a/tezt/lib_performance_regression/dune +++ b/tezt/lib_performance_regression/dune @@ -2,8 +2,8 @@ ; Edit file manifest/main.ml instead. (library - (name tezt_performance_regression) - (public_name octez-libs.tezt-performance-regression) + (name tezt_tezos_tezt_performance_regression) + (public_name tezt-tezos.tezt-performance-regression) (libraries tezt uri diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune index 334d2d8f9c8606633697724df5ba038866506e64..8515f72e6f0e227fef6ba2adbe522b5fb89accbf 100644 --- a/tezt/lib_tezos/dune +++ b/tezt/lib_tezos/dune @@ -3,10 +3,10 @@ (library (name tezt_tezos) - (public_name octez-libs.tezt-tezos) + (public_name tezt-tezos) (libraries tezt - octez-libs.tezt-performance-regression + tezt-tezos.tezt-performance-regression uri hex octez-libs.tezos-crypto-dal @@ -17,4 +17,4 @@ (:standard) -open Tezt -open Tezt.Base - -open Tezt_performance_regression)) + -open Tezt_tezos_tezt_performance_regression)) diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 0acbdbbd03d0e493bcec361052ebb3a14656c3ad..2c0242ecf5f61c3ba96bec8ae6d8f4104d24d515 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -1,8 +1,8 @@ (executable (name main) (libraries tezt - octez-libs.tezt-tezos - octez-libs.tezt-performance-regression + tezt-tezos + tezt-tezos.tezt-performance-regression octez-libs.tezos-lwt-result-stdlib tezos-alpha-test-helpers octez-libs.tezos-micheline @@ -19,7 +19,7 @@ -open Tezt_tezos -open Tezt_tezos.Runnable.Syntax -open Tezt.Base - -open Tezt_performance_regression + -open Tezt_tezos_tezt_performance_regression -open Tezos_lwt_result_stdlib -open Tezos_event_logging -open Tezos_test_helpers diff --git a/tezt/manual_tests/dune b/tezt/manual_tests/dune index ba97e6a0675277668dbbb1acba0e96b4bc38e51f..b61dedc1f0f6aaf01b15592207d3859586d5432a 100644 --- a/tezt/manual_tests/dune +++ b/tezt/manual_tests/dune @@ -1,7 +1,7 @@ (executable (name main) (libraries - octez-libs.tezt-tezos + tezt-tezos yes_wallet_lib src_proto_alpha_lib_client_test_tezt_lib) (flags (:standard diff --git a/tezt/remote_tests/dune b/tezt/remote_tests/dune index 8d3f57be5285e82cdf84311be6f2a842500a1f6e..031aac7556a3fe6a239092f68d82b0df08e382a9 100644 --- a/tezt/remote_tests/dune +++ b/tezt/remote_tests/dune @@ -1,5 +1,5 @@ (executable (name main) (libraries - octez-libs.tezt-tezos) + tezt-tezos) (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune index 69eea0b930aea053171048d281cdbc2348b0b374..d8dba2f9aeccc6c7ae1f638798af2b52b24f712f 100644 --- a/tezt/self_tests/dune +++ b/tezt/self_tests/dune @@ -7,7 +7,7 @@ (libraries tezt.core tezt - octez-libs.tezt-tezos) + tezt-tezos) (library_flags (:standard -linkall)) (flags (:standard) @@ -28,7 +28,7 @@ (rule (alias runtest) - (package octez-libs) + (package tezt-tezos) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/tezt/snoop/dune b/tezt/snoop/dune index 8d3f57be5285e82cdf84311be6f2a842500a1f6e..031aac7556a3fe6a239092f68d82b0df08e382a9 100644 --- a/tezt/snoop/dune +++ b/tezt/snoop/dune @@ -1,5 +1,5 @@ (executable (name main) (libraries - octez-libs.tezt-tezos) + tezt-tezos) (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/tests/dune b/tezt/tests/dune index 60386c208aab0decfefb7dbafb06cdfa97394e7b..e6a51ae8f7b50ca07ca3945f8dc0620692d5324a 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -9,7 +9,7 @@ tezt str bls12-381 - octez-libs.tezt-tezos + tezt-tezos tezt_ethereum data-encoding octez-libs.tezos-base diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index 0f1bce4abff716a125df0e04d2404ee2109d77b1..3b68a42e2e3832b9182b5b749cf36f5b2e65bddc 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -4,7 +4,7 @@ tezos-alpha-test-helpers octez-libs.tezos-micheline tezos-protocol-alpha - octez-libs.tezt-tezos + tezt-tezos ptime) (flags (:standard (:include %{workspace_root}/macos-link-flags.sexp)