diff --git a/.gitlab/ci/opam-ci.yml b/.gitlab/ci/opam-ci.yml index 702fd3e28ee7675ed5a2a0520968273b9bb49c83..840e0ed6ea65c2e2cb69231fe82e5059b67fe6c9 100644 --- a/.gitlab/ci/opam-ci.yml +++ b/.gitlab/ci/opam-ci.yml @@ -13,6 +13,8 @@ # Ignoring package tezos-dal-node-services, it only contains tests or private targets +# Ignoring package tezos-layer2-store, it only contains tests or private targets + # Ignoring package tezos-protocol-012-Psithaca-tests, it only contains tests or private targets # Ignoring package tezos-protocol-013-PtJakart-tests, it only contains tests or private targets diff --git a/dune-project b/dune-project index 1a97804dd9901e5c06acf4640e68293dc4c0d308..c66cbba4d0f758183a4bc8f1d7b06d39e2347571 100644 --- a/dune-project +++ b/dune-project @@ -102,6 +102,7 @@ (package (name tezos-injector-013-PtJakart)) (package (name tezos-injector-014-PtKathma)) (package (name tezos-injector-alpha)) +(package (name tezos-layer2-store)(allow_empty)) (package (name tezos-layer2-utils-alpha)) (package (name tezos-lwt-result-stdlib)) (package (name tezos-micheline)) diff --git a/manifest/main.ml b/manifest/main.ml index b0b27e17db4ed142ccd8b1e31a3548474339ed3e..2af67f7ec81a077a8b2386202f7824c8af173273 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3047,6 +3047,22 @@ let _octez_embedded_protocol_packer = ~linkall:true ~modules:["Main_embedded_packer"] +let octez_layer2_store = + private_lib + "tezos_layer2_store" + ~path:"src/lib_layer2_store" + ~opam:"tezos-layer2-store" + ~synopsis:"Tezos: layer2 storage utils" + ~deps: + [ + octez_base |> open_ ~m:"TzPervasives"; + irmin_pack; + irmin_pack_unix; + irmin; + octez_context_encoding; + ] + ~linkall:true + let octez_dal_node_services = private_lib "tezos_dal_node_services" @@ -4485,9 +4501,6 @@ module Protocol = Protocol main |> open_; client |> if_some |> open_; octez_rpc |> open_; - irmin_pack; - irmin_pack_unix; - irmin; ] ~inline_tests:ppx_expect ~linkall:true @@ -4563,6 +4576,7 @@ module Protocol = Protocol octez_shell_services |> open_; sc_rollup |> if_some |> open_; layer2_utils |> if_some |> open_; + octez_layer2_store |> open_; data_encoding; irmin_pack; irmin_pack_unix; diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam new file mode 100644 index 0000000000000000000000000000000000000000..de2f50697c0d6c56e200b254106ed09b421e38b5 --- /dev/null +++ b/opam/tezos-layer2-store.opam @@ -0,0 +1,22 @@ +# 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" } + "tezos-base" + "irmin-pack" { >= "3.4.0" & < "3.5.0" } + "irmin" { >= "3.4.0" & < "3.5.0" } + "tezos-context" +] +build: [ + ["rm" "-r" "vendors"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Tezos: layer2 storage utils" diff --git a/opam/tezos-layer2-utils-alpha.opam b/opam/tezos-layer2-utils-alpha.opam index 32666f452e590ad4e121168d4cd3e3d1c916540a..4b31119686bc8a4662caf38eee190a6c6fa8ca83 100644 --- a/opam/tezos-layer2-utils-alpha.opam +++ b/opam/tezos-layer2-utils-alpha.opam @@ -14,8 +14,6 @@ depends: [ "tezos-protocol-alpha" "tezos-client-alpha" "tezos-rpc" - "irmin-pack" { >= "3.4.0" & < "3.5.0" } - "irmin" { >= "3.4.0" & < "3.5.0" } ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index 831b36c09c994555f8155345757ca32ababbf33a..9cb54d57fa596345a62d55a566620e2123518ee7 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -24,6 +24,7 @@ depends: [ "tezos-dal-node-services" "tezos-shell-services" "tezos-sc-rollup-013-PtJakart" + "tezos-layer2-store" "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.4.0" & < "3.5.0" } "irmin" { >= "3.4.0" & < "3.5.0" } diff --git a/opam/tezos-sc-rollup-node-014-PtKathma.opam b/opam/tezos-sc-rollup-node-014-PtKathma.opam index acbb61d074e6bb73c0dee14573f6d38edc4ec6bc..aefc968fd58295cf038508e869d5572a5cf0a8e2 100644 --- a/opam/tezos-sc-rollup-node-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-node-014-PtKathma.opam @@ -24,6 +24,7 @@ depends: [ "tezos-dal-node-services" "tezos-shell-services" "tezos-sc-rollup-014-PtKathma" + "tezos-layer2-store" "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.4.0" & < "3.5.0" } "irmin" { >= "3.4.0" & < "3.5.0" } diff --git a/opam/tezos-sc-rollup-node-alpha.opam b/opam/tezos-sc-rollup-node-alpha.opam index 79f050b7ac234a9acd96381e1e6ff53977e6e6be..8b6e5315770c236d09bef181db201678957dea4c 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -25,6 +25,7 @@ depends: [ "tezos-shell-services" "tezos-sc-rollup-alpha" "tezos-layer2-utils-alpha" + "tezos-layer2-store" "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.4.0" & < "3.5.0" } "irmin" { >= "3.4.0" & < "3.5.0" } diff --git a/src/lib_layer2_store/dune b/src/lib_layer2_store/dune new file mode 100644 index 0000000000000000000000000000000000000000..301e0e2414539921aba7df084c490d97833c4507 --- /dev/null +++ b/src/lib_layer2_store/dune @@ -0,0 +1,17 @@ +; This file was automatically generated, do not edit. +; Edit file manifest/main.ml instead. + +(library + (name tezos_layer2_store) + (package tezos-layer2-store) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + irmin-pack + irmin-pack.unix + irmin + tezos-context.encoding) + (library_flags (:standard -linkall)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/proto_alpha/lib_layer2_utils/store_utils.ml b/src/lib_layer2_store/store_utils.ml similarity index 100% rename from src/proto_alpha/lib_layer2_utils/store_utils.ml rename to src/lib_layer2_store/store_utils.ml diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune index f430811028093203940146d68ad8263ae1e56305..7f9be3976971cc6708f424eff2bcb25338458b15 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune @@ -24,6 +24,7 @@ tezos_dal_node_services tezos-shell-services tezos-sc-rollup-013-PtJakart + tezos_layer2_store data-encoding irmin-pack irmin-pack.unix @@ -49,4 +50,5 @@ -open Tezos_rpc -open Tezos_shell_services -open Tezos_sc_rollup_013_PtJakart + -open Tezos_layer2_store -open Tezos_injector_013_PtJakart)) diff --git a/src/proto_014_PtKathma/bin_sc_rollup_node/dune b/src/proto_014_PtKathma/bin_sc_rollup_node/dune index 32b2d4c52b52d81183938d2e0f102052ce140da1..8a29a9f19848e6933da92867cce579b37c074d8c 100644 --- a/src/proto_014_PtKathma/bin_sc_rollup_node/dune +++ b/src/proto_014_PtKathma/bin_sc_rollup_node/dune @@ -24,6 +24,7 @@ tezos_dal_node_services tezos-shell-services tezos-sc-rollup-014-PtKathma + tezos_layer2_store data-encoding irmin-pack irmin-pack.unix @@ -49,4 +50,5 @@ -open Tezos_rpc -open Tezos_shell_services -open Tezos_sc_rollup_014_PtKathma + -open Tezos_layer2_store -open Tezos_injector_014_PtKathma)) diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 5f5f1a2d5d80862368efc5918f949e049edbcc92..6e27d9926208d7b03ddef6e4bbdab3c55cde741a 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -25,6 +25,7 @@ tezos-shell-services tezos-sc-rollup-alpha tezos-layer2-utils-alpha + tezos_layer2_store data-encoding irmin-pack irmin-pack.unix @@ -51,4 +52,5 @@ -open Tezos_shell_services -open Tezos_sc_rollup_alpha -open Tezos_layer2_utils_alpha + -open Tezos_layer2_store -open Tezos_injector_alpha)) diff --git a/src/proto_alpha/lib_layer2_utils/dune b/src/proto_alpha/lib_layer2_utils/dune index a03fa450514d4a0720bcb6f3f71d7595d9bb411d..75b873dbdefa33cb63dffb11bb0bf081265065ab 100644 --- a/src/proto_alpha/lib_layer2_utils/dune +++ b/src/proto_alpha/lib_layer2_utils/dune @@ -9,10 +9,7 @@ tezos-base tezos-protocol-alpha tezos-client-alpha - tezos-rpc - irmin-pack - irmin-pack.unix - irmin) + tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (library_flags (:standard -linkall))