From 8583b35feeafad1bfa0e3c8b9c0ab7aafa9699d9 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 21 Apr 2023 14:26:19 +0200 Subject: [PATCH 1/4] manifest: introduce .lifted library --- manifest/main.ml | 44 ++++++++++++++++++++---- src/proto_000_Ps9mPmXa/lib_protocol/dune | 22 ++++++++++++ src/proto_001_PtCJ7pwo/lib_protocol/dune | 22 ++++++++++++ src/proto_002_PsYLVpVv/lib_protocol/dune | 22 ++++++++++++ src/proto_003_PsddFKi3/lib_protocol/dune | 22 ++++++++++++ src/proto_004_Pt24m4xi/lib_protocol/dune | 22 ++++++++++++ src/proto_005_PsBABY5H/lib_protocol/dune | 22 ++++++++++++ src/proto_005_PsBabyM1/lib_protocol/dune | 22 ++++++++++++ src/proto_006_PsCARTHA/lib_protocol/dune | 22 ++++++++++++ src/proto_007_PsDELPH1/lib_protocol/dune | 22 ++++++++++++ src/proto_008_PtEdo2Zk/lib_protocol/dune | 22 ++++++++++++ src/proto_008_PtEdoTez/lib_protocol/dune | 22 ++++++++++++ src/proto_009_PsFLoren/lib_protocol/dune | 22 ++++++++++++ src/proto_010_PtGRANAD/lib_protocol/dune | 22 ++++++++++++ src/proto_011_PtHangz2/lib_protocol/dune | 22 ++++++++++++ src/proto_012_Psithaca/lib_protocol/dune | 22 ++++++++++++ src/proto_013_PtJakart/lib_protocol/dune | 22 ++++++++++++ src/proto_014_PtKathma/lib_protocol/dune | 21 +++++++++++ src/proto_015_PtLimaPt/lib_protocol/dune | 21 +++++++++++ src/proto_016_PtMumbai/lib_protocol/dune | 21 +++++++++++ src/proto_017_PtNairob/lib_protocol/dune | 21 +++++++++++ src/proto_alpha/lib_protocol/dune | 21 +++++++++++ src/proto_demo_counter/lib_protocol/dune | 21 +++++++++++ src/proto_demo_noops/lib_protocol/dune | 21 +++++++++++ src/proto_genesis/lib_protocol/dune | 21 +++++++++++ 25 files changed, 558 insertions(+), 6 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 755293e96db4..08cb5bd60d2f 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -4564,7 +4564,7 @@ end = struct List.filter_map (fun (x, b) -> if b then Some x else None) module Lib_protocol = struct - type t = {main : target; embedded : target} + type t = {main : target; lifted : target; embedded : target} let make_tests ?test_helpers ?parameters ?plugin ?client ?benchmark ?benchmark_type_inference ?octez_sc_rollup ~main ~name () = @@ -5127,6 +5127,36 @@ module Protocol = Protocol ]; ] in + let lifted = + public_lib + (sf "tezos-protocol-%s.lifted" name_dash) + ~path:(path // "lib_protocol") + ~opam:(sf "tezos-protocol-%s" name_dash) + ~modules:["Lifted_protocol"] + ~flags:(Flags.standard ~nopervasives:true ~disable_warnings ()) + ~deps: + [ + octez_protocol_environment; + tezos_protocol_environment_sigs; + main |> open_; + ] + ~dune: + Dune. + [ + targets_rule + ["lifted_protocol.ml"] + ~action: + [ + S "write-file"; + S "%{targets}"; + S + {| +include Environment.Lift (Protocol) +let hash = Protocol.hash +|}; + ]; + ] + in let _functor = private_lib (sf "tezos_protocol_%s_functor" name_underscore) @@ -5235,12 +5265,12 @@ module Protocol = Protocol ]; ] in - {main; embedded} + {main; lifted; embedded} end let genesis = let name = Name.other "genesis" in - let {Lib_protocol.main; embedded} = + let {Lib_protocol.main; lifted = _; embedded} = Lib_protocol.make ~name ~status:Not_mainnet in let client = @@ -5266,14 +5296,14 @@ module Protocol = Protocol let demo_noops = let name = Name.other "demo-noops" in - let {Lib_protocol.main; embedded} = + let {Lib_protocol.main; lifted = _; embedded} = Lib_protocol.make ~name ~status:Not_mainnet in register @@ make ~name ~status:Not_mainnet ~main ~embedded () let _demo_counter = let name = Name.other "demo-counter" in - let {Lib_protocol.main; embedded} = + let {Lib_protocol.main; lifted = _; embedded} = Lib_protocol.make ~name ~status:Not_mainnet in let client = @@ -5333,7 +5363,9 @@ module Protocol = Protocol let both o1 o2 = match (o1, o2) with Some x, Some y -> Some (x, y) | _, _ -> None in - let {Lib_protocol.main; embedded} = Lib_protocol.make ~name ~status in + let {Lib_protocol.main; lifted = _; embedded} = + Lib_protocol.make ~name ~status + in let parameters = only_if (N.(number >= 011) && not_overridden) @@ fun () -> public_lib diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index f20ae1bb7b04..1781e7b27540 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -79,6 +79,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_000_Ps9mPmXa_lifted) + (public_name tezos-protocol-000-Ps9mPmXa.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-000-Ps9mPmXa) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_000_Ps9mPmXa) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_000_Ps9mPmXa_functor) (libraries diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index 0ccc7d54b04f..16ea03e5a4f5 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -212,6 +212,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_001_PtCJ7pwo_lifted) + (public_name tezos-protocol-001-PtCJ7pwo.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-001-PtCJ7pwo) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_001_PtCJ7pwo) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_001_PtCJ7pwo_functor) (libraries diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 3f652ff48fe3..c86cd0ca6bde 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -212,6 +212,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_002_PsYLVpVv_lifted) + (public_name tezos-protocol-002-PsYLVpVv.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-002-PsYLVpVv) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_002_PsYLVpVv) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_002_PsYLVpVv_functor) (libraries diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 2ea0586e1164..e63065ee9336 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -214,6 +214,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_003_PsddFKi3_lifted) + (public_name tezos-protocol-003-PsddFKi3.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-003-PsddFKi3) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_003_PsddFKi3) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_003_PsddFKi3_functor) (libraries diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index d94e5f48906a..4f8ec44ea31e 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -214,6 +214,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_004_Pt24m4xi_lifted) + (public_name tezos-protocol-004-Pt24m4xi.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-004-Pt24m4xi) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_004_Pt24m4xi) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_004_Pt24m4xi_functor) (libraries diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index a4133965562a..e7ac4a3e6249 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -216,6 +216,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_005_PsBABY5H_lifted) + (public_name tezos-protocol-005-PsBABY5H.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-005-PsBABY5H) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_005_PsBABY5H) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_005_PsBABY5H_functor) (libraries diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index e36889788ac2..6adf7a012dd3 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -216,6 +216,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_005_PsBabyM1_lifted) + (public_name tezos-protocol-005-PsBabyM1.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-005-PsBabyM1) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_005_PsBabyM1) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_005_PsBabyM1_functor) (libraries diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index b7f0befc854f..f9018030da00 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -216,6 +216,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_006_PsCARTHA_lifted) + (public_name tezos-protocol-006-PsCARTHA.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-006-PsCARTHA) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_006_PsCARTHA) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_006_PsCARTHA_functor) (libraries diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index 2b72065887b5..1f48123cfe31 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -220,6 +220,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_007_PsDELPH1_lifted) + (public_name tezos-protocol-007-PsDELPH1.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-007-PsDELPH1) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_007_PsDELPH1) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_007_PsDELPH1_functor) (libraries diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index b5be2a22e48c..069dd812742e 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -230,6 +230,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_008_PtEdo2Zk_lifted) + (public_name tezos-protocol-008-PtEdo2Zk.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-008-PtEdo2Zk) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_008_PtEdo2Zk) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_008_PtEdo2Zk_functor) (libraries diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 95304a6d3864..81a9251fc0e5 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -230,6 +230,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_008_PtEdoTez_lifted) + (public_name tezos-protocol-008-PtEdoTez.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-008-PtEdoTez) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_008_PtEdoTez) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_008_PtEdoTez_functor) (libraries diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index 815936a4808c..9e4c7d5d757e 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -236,6 +236,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_009_PsFLoren_lifted) + (public_name tezos-protocol-009-PsFLoren.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-009-PsFLoren) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_009_PsFLoren) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_009_PsFLoren_functor) (libraries diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index ca2bf2bc0c2f..d715daf52d71 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -246,6 +246,28 @@ -warn-error +a .))) +(library + (name tezos_protocol_010_PtGRANAD_lifted) + (public_name tezos-protocol-010-PtGRANAD.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-010-PtGRANAD) + (flags + (:standard) + -w -6-7-9-16-29-32-51-68 + -nopervasives + -open Tezos_protocol_010_PtGRANAD) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_010_PtGRANAD_functor) (libraries diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 1bf60b667fca..eb025d6ace7b 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -267,6 +267,28 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warning -51 -warn-error +a .))) +(library + (name tezos_protocol_011_PtHangz2_lifted) + (public_name tezos-protocol-011-PtHangz2.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-011-PtHangz2) + (flags + (:standard) + -w -51 + -nopervasives + -open Tezos_protocol_011_PtHangz2) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_011_PtHangz2_functor) (libraries diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 8286540fe1a7..b48ceacc88d8 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -301,6 +301,28 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warning -51 -warn-error +a .))) +(library + (name tezos_protocol_012_Psithaca_lifted) + (public_name tezos-protocol-012-Psithaca.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-012-Psithaca) + (flags + (:standard) + -w -51 + -nopervasives + -open Tezos_protocol_012_Psithaca) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_012_Psithaca_functor) (libraries diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index 760873a95274..9e3264aa8e1d 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -432,6 +432,28 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warning -51 -warn-error +a .))) +(library + (name tezos_protocol_013_PtJakart_lifted) + (public_name tezos-protocol-013-PtJakart.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-013-PtJakart) + (flags + (:standard) + -w -51 + -nopervasives + -open Tezos_protocol_013_PtJakart) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_013_PtJakart_functor) (libraries diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune index b2289ead86d8..7ffe064a22a9 100644 --- a/src/proto_014_PtKathma/lib_protocol/dune +++ b/src/proto_014_PtKathma/lib_protocol/dune @@ -479,6 +479,27 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warn-error +a .))) +(library + (name tezos_protocol_014_PtKathma_lifted) + (public_name tezos-protocol-014-PtKathma.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-014-PtKathma) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_014_PtKathma) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_014_PtKathma_functor) (libraries diff --git a/src/proto_015_PtLimaPt/lib_protocol/dune b/src/proto_015_PtLimaPt/lib_protocol/dune index 2e69c4ff73d3..dc8a78ca0ba3 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/dune @@ -528,6 +528,27 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warn-error +a .))) +(library + (name tezos_protocol_015_PtLimaPt_lifted) + (public_name tezos-protocol-015-PtLimaPt.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-015-PtLimaPt) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_015_PtLimaPt) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_015_PtLimaPt_functor) (libraries diff --git a/src/proto_016_PtMumbai/lib_protocol/dune b/src/proto_016_PtMumbai/lib_protocol/dune index cb6b8a892ebe..81fa7a916a63 100644 --- a/src/proto_016_PtMumbai/lib_protocol/dune +++ b/src/proto_016_PtMumbai/lib_protocol/dune @@ -562,6 +562,27 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warn-error +a .))) +(library + (name tezos_protocol_016_PtMumbai_lifted) + (public_name tezos-protocol-016-PtMumbai.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-016-PtMumbai) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_016_PtMumbai) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_016_PtMumbai_functor) (libraries diff --git a/src/proto_017_PtNairob/lib_protocol/dune b/src/proto_017_PtNairob/lib_protocol/dune index 5e03d5a49d8d..05956a2b2b4c 100644 --- a/src/proto_017_PtNairob/lib_protocol/dune +++ b/src/proto_017_PtNairob/lib_protocol/dune @@ -568,6 +568,27 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -warn-error +a .))) +(library + (name tezos_protocol_017_PtNairob_lifted) + (public_name tezos-protocol-017-PtNairob.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-017-PtNairob) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_017_PtNairob) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_017_PtNairob_functor) (libraries diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index 1acfcd30aadf..1de27598da43 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -552,6 +552,27 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -no-hash-check -warn-error +a .))) +(library + (name tezos_protocol_alpha_lifted) + (public_name tezos-protocol-alpha.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-alpha) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_alpha) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_alpha_functor) (libraries diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index 673abd962fd1..1fe1f001a7a4 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -89,6 +89,27 @@ (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -no-hash-check -warn-error +a .))) +(library + (name tezos_protocol_demo_counter_lifted) + (public_name tezos-protocol-demo-counter.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-demo-counter) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_demo_counter) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_demo_counter_functor) (libraries diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index fbad2bba63d1..d5a670764d0a 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -70,6 +70,27 @@ (deps main.ml main.mli (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -no-hash-check -warn-error +a .))) +(library + (name tezos_protocol_demo_noops_lifted) + (public_name tezos-protocol-demo-noops.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-demo-noops) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_demo_noops) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_demo_noops_functor) (libraries diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 7c79a4039fd2..043320af1310 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -72,6 +72,27 @@ main.ml main.mli (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:octez-protocol-compiler} -no-hash-check -warn-error +a .))) +(library + (name tezos_protocol_genesis_lifted) + (public_name tezos-protocol-genesis.lifted) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-protocol-environment + tezos-protocol-environment.sigs + tezos-protocol-genesis) + (flags + (:standard) + -nopervasives + -open Tezos_protocol_genesis) + (modules Lifted_protocol)) + +(rule + (targets lifted_protocol.ml) + (action + (write-file + %{targets} + "\ninclude Environment.Lift (Protocol)\nlet hash = Protocol.hash\n"))) + (library (name tezos_protocol_genesis_functor) (libraries -- GitLab From f7e6d0dd3d7db1c61db8cdce133570da04a580d0 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 21 Apr 2023 14:32:58 +0200 Subject: [PATCH 2/4] manifest: lib_client depends on .lifted --- manifest/main.ml | 9 ++++++--- src/proto_000_Ps9mPmXa/lib_client/dune | 1 + src/proto_001_PtCJ7pwo/lib_client/dune | 1 + src/proto_002_PsYLVpVv/lib_client/dune | 1 + src/proto_003_PsddFKi3/lib_client/dune | 1 + src/proto_004_Pt24m4xi/lib_client/dune | 1 + src/proto_005_PsBabyM1/lib_client/dune | 1 + src/proto_006_PsCARTHA/lib_client/dune | 1 + src/proto_007_PsDELPH1/lib_client/dune | 1 + src/proto_008_PtEdo2Zk/lib_client/dune | 1 + src/proto_009_PsFLoren/lib_client/dune | 1 + src/proto_010_PtGRANAD/lib_client/dune | 1 + src/proto_011_PtHangz2/lib_client/dune | 1 + src/proto_012_Psithaca/lib_client/dune | 1 + src/proto_013_PtJakart/lib_client/dune | 1 + src/proto_014_PtKathma/lib_client/dune | 1 + src/proto_015_PtLimaPt/lib_client/dune | 1 + src/proto_016_PtMumbai/lib_client/dune | 1 + src/proto_017_PtNairob/lib_client/dune | 1 + src/proto_alpha/lib_client/dune | 1 + src/proto_demo_counter/lib_client/dune | 3 ++- src/proto_genesis/lib_client/dune | 1 + 22 files changed, 28 insertions(+), 4 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 08cb5bd60d2f..6d4ba021369f 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -5270,7 +5270,7 @@ let hash = Protocol.hash let genesis = let name = Name.other "genesis" in - let {Lib_protocol.main; lifted = _; embedded} = + let {Lib_protocol.main; lifted; embedded} = Lib_protocol.make ~name ~status:Not_mainnet in let client = @@ -5286,6 +5286,7 @@ let hash = Protocol.hash octez_client_base |> open_; octez_protocol_environment; main |> open_; + lifted; octez_client_commands |> open_; octez_proxy; octez_stdlib_unix; @@ -5303,7 +5304,7 @@ let hash = Protocol.hash let _demo_counter = let name = Name.other "demo-counter" in - let {Lib_protocol.main; lifted = _; embedded} = + let {Lib_protocol.main; lifted; embedded} = Lib_protocol.make ~name ~status:Not_mainnet in let client = @@ -5319,6 +5320,7 @@ let hash = Protocol.hash octez_client_base |> open_; octez_client_commands |> open_; main |> open_; + lifted; ] ~linkall:true in @@ -5363,7 +5365,7 @@ let hash = Protocol.hash let both o1 o2 = match (o1, o2) with Some x, Some y -> Some (x, y) | _, _ -> None in - let {Lib_protocol.main; lifted = _; embedded} = + let {Lib_protocol.main; lifted; embedded} = Lib_protocol.make ~name ~status in let parameters = @@ -5480,6 +5482,7 @@ let hash = Protocol.hash octez_shell_services |> open_; octez_client_base |> open_; main |> open_; + lifted; octez_mockup_registration |> if_ N.(number >= 011); octez_proxy |> if_ N.(number >= 011); octez_signer_backends |> if_ N.(number >= 001); diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index 69fbbb5b6054..f7a88e51d569 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-000-Ps9mPmXa + tezos-protocol-000-Ps9mPmXa.lifted tezos-rpc tezos-client-commands tezos-stdlib-unix) diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index a1e938f27d89..f175aa2f0679 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-001-PtCJ7pwo + tezos-protocol-001-PtCJ7pwo.lifted tezos-signer-backends tezos-rpc uri) diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index 41177f7e5f9a..b77e7f5719e6 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-002-PsYLVpVv + tezos-protocol-002-PsYLVpVv.lifted tezos-signer-backends tezos-rpc uri) diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index c3fdb45a75f3..f51109d59f70 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-003-PsddFKi3 + tezos-protocol-003-PsddFKi3.lifted tezos-signer-backends tezos-rpc uri) diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index 4e4dab721a80..8b3172f3ee48 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-004-Pt24m4xi + tezos-protocol-004-Pt24m4xi.lifted tezos-signer-backends tezos-rpc uri) diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 879b0710f2cb..54c2b659d9c9 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-005-PsBabyM1 + tezos-protocol-005-PsBabyM1.lifted tezos-signer-backends tezos-rpc uri) diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index 6a3014a37d6f..e255147abc1e 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-006-PsCARTHA + tezos-protocol-006-PsCARTHA.lifted tezos-signer-backends tezos-rpc uri) diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 980bbf035069..616abd1d9422 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -10,6 +10,7 @@ tezos-shell-services tezos-client-base tezos-protocol-007-PsDELPH1 + tezos-protocol-007-PsDELPH1.lifted tezos-signer-backends tezos-protocol-plugin-007-PsDELPH1 tezos-rpc diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index 2a114154bbb8..516d0772f213 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-008-PtEdo2Zk + tezos-protocol-008-PtEdo2Zk.lifted tezos-signer-backends tezos-protocol-plugin-008-PtEdo2Zk tezos-rpc diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index d0e91b385d24..f2d0752430fb 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-009-PsFLoren + tezos-protocol-009-PsFLoren.lifted tezos-signer-backends tezos-protocol-plugin-009-PsFLoren tezos-rpc diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 8b151b6e19af..0744348c49df 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-010-PtGRANAD + tezos-protocol-010-PtGRANAD.lifted tezos-signer-backends tezos-protocol-plugin-010-PtGRANAD tezos-rpc diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 2e25d4f78c53..df0bca428fd2 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-011-PtHangz2 + tezos-protocol-011-PtHangz2.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index 3e6c7079180b..a43404fbe692 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-012-Psithaca + tezos-protocol-012-Psithaca.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 07281e9cdbcc..375844bcb6d0 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-013-PtJakart + tezos-protocol-013-PtJakart.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index 66d3312f0755..f0258790f2d8 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-014-PtKathma + tezos-protocol-014-PtKathma.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index 3f8dd5064555..5df6fcd3725c 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-015-PtLimaPt + tezos-protocol-015-PtLimaPt.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index 2afbaa862608..a2195469cdfb 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-016-PtMumbai + tezos-protocol-016-PtMumbai.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index 8e14e00bc3c5..b21f2e63b077 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-017-PtNairob + tezos-protocol-017-PtNairob.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 3668f2e00086..07fc2e4a7c4d 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -11,6 +11,7 @@ tezos-shell-services tezos-client-base tezos-protocol-alpha + tezos-protocol-alpha.lifted tezos-mockup-registration tezos-proxy tezos-signer-backends diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune index 68029e931a4a..48eb6d1e1eb7 100644 --- a/src/proto_demo_counter/lib_client/dune +++ b/src/proto_demo_counter/lib_client/dune @@ -10,7 +10,8 @@ tezos-shell-services tezos-client-base tezos-client-commands - tezos-protocol-demo-counter) + tezos-protocol-demo-counter + tezos-protocol-demo-counter.lifted) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index 3d26598d8c52..90ffa01ff3e5 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -11,6 +11,7 @@ tezos-client-base tezos-protocol-environment tezos-protocol-genesis + tezos-protocol-genesis.lifted tezos-client-commands tezos-proxy tezos-stdlib-unix) -- GitLab From 4436cabd2aabbeac3871ea5ac1f3a2888ce95181 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 21 Apr 2023 14:40:50 +0200 Subject: [PATCH 3/4] proto/lib_client: use lifted protocol for block_services --- .../lib_client/protocol_client_context.ml | 4 +++- .../lib_client/alpha_client_context.ml | 4 +++- .../lib_client/alpha_client_context.ml | 4 +++- .../lib_client/alpha_client_context.ml | 4 +++- .../lib_client/alpha_client_context.ml | 4 +++- .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 7 +------ .../lib_client/protocol_client_context.ml | 10 +++------- 19 files changed, 31 insertions(+), 90 deletions(-) diff --git a/src/proto_000_Ps9mPmXa/lib_client/protocol_client_context.ml b/src/proto_000_Ps9mPmXa/lib_client/protocol_client_context.ml index c306c0b1a846..a24f2145a5a7 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/protocol_client_context.ml +++ b/src/proto_000_Ps9mPmXa/lib_client/protocol_client_context.ml @@ -23,4 +23,6 @@ (* *) (*****************************************************************************) -module Genesis_block_services = Block_services.Make (Protocol) (Protocol) +module Lifted_protocol = Tezos_protocol_000_Ps9mPmXa_lifted.Lifted_protocol +module Genesis_block_services = + Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml b/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml index bf50ed809459..3f94c91488b7 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml +++ b/src/proto_001_PtCJ7pwo/lib_client/alpha_client_context.ml @@ -23,7 +23,9 @@ (* *) (*****************************************************************************) -module Alpha_block_services = Block_services.Make (Protocol) (Protocol) +module Lifted_protocol = Tezos_protocol_001_PtCJ7pwo_lifted.Lifted_protocol +module Alpha_block_services = + Block_services.Make (Lifted_protocol) (Lifted_protocol) (** Client RPC context *) diff --git a/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml b/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml index bf50ed809459..48d4e495fd93 100644 --- a/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml +++ b/src/proto_002_PsYLVpVv/lib_client/alpha_client_context.ml @@ -23,7 +23,9 @@ (* *) (*****************************************************************************) -module Alpha_block_services = Block_services.Make (Protocol) (Protocol) +module Lifted_protocol = Tezos_protocol_002_PsYLVpVv_lifted.Lifted_protocol +module Alpha_block_services = + Block_services.Make (Lifted_protocol) (Lifted_protocol) (** Client RPC context *) diff --git a/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml b/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml index bf50ed809459..16a35685f3ef 100644 --- a/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml +++ b/src/proto_003_PsddFKi3/lib_client/alpha_client_context.ml @@ -23,7 +23,9 @@ (* *) (*****************************************************************************) -module Alpha_block_services = Block_services.Make (Protocol) (Protocol) +module Lifted_protocol = Tezos_protocol_003_PsddFKi3_lifted.Lifted_protocol +module Alpha_block_services = + Block_services.Make (Lifted_protocol) (Lifted_protocol) (** Client RPC context *) diff --git a/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml b/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml index fba8c32b239b..40c46fc88f1a 100644 --- a/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml +++ b/src/proto_004_Pt24m4xi/lib_client/alpha_client_context.ml @@ -23,7 +23,9 @@ (* *) (*****************************************************************************) -module Alpha_block_services = Block_services.Make (Protocol) (Protocol) +module Lifted_protocol = Tezos_protocol_004_Pt24m4xi_lifted.Lifted_protocol +module Alpha_block_services = + Block_services.Make (Lifted_protocol) (Lifted_protocol) (** Client RPC context *) diff --git a/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml b/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml index 2ea5f2736c97..497bddda859c 100644 --- a/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml +++ b/src/proto_005_PsBabyM1/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_005_PsBabyM1_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml b/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml index 132e3074884f..a8fa7b12ce3a 100644 --- a/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml +++ b/src/proto_006_PsCARTHA/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_006_PsCARTHA_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml b/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml index a2a130df2f32..f0b0e91da635 100644 --- a/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml +++ b/src/proto_007_PsDELPH1/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_007_PsDELPH1_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml b/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml index 66265b7ae3d6..fe9af6ee57ec 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml +++ b/src/proto_008_PtEdo2Zk/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_008_PtEdo2Zk_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml b/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml index ea5ed509da7f..f9d91316fd95 100644 --- a/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml +++ b/src/proto_009_PsFLoren/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_009_PsFLoren_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml b/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml index ea5ed509da7f..2afb56e9240f 100644 --- a/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml +++ b/src/proto_010_PtGRANAD/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_010_PtGRANAD_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml b/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml index ea5ed509da7f..c523652a9193 100644 --- a/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml +++ b/src/proto_011_PtHangz2/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_011_PtHangz2_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_012_Psithaca/lib_client/protocol_client_context.ml b/src/proto_012_Psithaca/lib_client/protocol_client_context.ml index 1f0eca5a9622..3ce9e8d4033a 100644 --- a/src/proto_012_Psithaca/lib_client/protocol_client_context.ml +++ b/src/proto_012_Psithaca/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_012_Psithaca_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_013_PtJakart/lib_client/protocol_client_context.ml b/src/proto_013_PtJakart/lib_client/protocol_client_context.ml index 969a026f04ff..96fc97ae9926 100644 --- a/src/proto_013_PtJakart/lib_client/protocol_client_context.ml +++ b/src/proto_013_PtJakart/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_013_PtJakart_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_014_PtKathma/lib_client/protocol_client_context.ml b/src/proto_014_PtKathma/lib_client/protocol_client_context.ml index 6e1c3e08d33a..33ccdaadc9ff 100644 --- a/src/proto_014_PtKathma/lib_client/protocol_client_context.ml +++ b/src/proto_014_PtKathma/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_014_PtKathma_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_015_PtLimaPt/lib_client/protocol_client_context.ml b/src/proto_015_PtLimaPt/lib_client/protocol_client_context.ml index 3fef1e144f44..67c8054c6720 100644 --- a/src/proto_015_PtLimaPt/lib_client/protocol_client_context.ml +++ b/src/proto_015_PtLimaPt/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_015_PtLimaPt_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_016_PtMumbai/lib_client/protocol_client_context.ml b/src/proto_016_PtMumbai/lib_client/protocol_client_context.ml index 595283dd48d8..a318eacc85ba 100644 --- a/src/proto_016_PtMumbai/lib_client/protocol_client_context.ml +++ b/src/proto_016_PtMumbai/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_016_PtMumbai_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_017_PtNairob/lib_client/protocol_client_context.ml b/src/proto_017_PtNairob/lib_client/protocol_client_context.ml index 595283dd48d8..28017d847627 100644 --- a/src/proto_017_PtNairob/lib_client/protocol_client_context.ml +++ b/src/proto_017_PtNairob/lib_client/protocol_client_context.ml @@ -23,12 +23,7 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - +module Lifted_protocol = Tezos_protocol_017_PtNairob_lifted.Lifted_protocol module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_genesis/lib_client/protocol_client_context.ml b/src/proto_genesis/lib_client/protocol_client_context.ml index 497124ef8148..e93d5645e3fb 100644 --- a/src/proto_genesis/lib_client/protocol_client_context.ml +++ b/src/proto_genesis/lib_client/protocol_client_context.ml @@ -23,10 +23,6 @@ (* *) (*****************************************************************************) -module Genesis_block_services = Block_services.Make (Protocol) (Protocol) - -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end +module Lifted_protocol = Tezos_protocol_genesis_lifted.Lifted_protocol +module Genesis_block_services = + Block_services.Make (Lifted_protocol) (Lifted_protocol) -- GitLab From 47b1f0fa71f725324cfc4d7288e053e3c6972892 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Fri, 21 Apr 2023 15:02:45 +0200 Subject: [PATCH 4/4] alpha: open and use lifted protocol when necessary --- manifest/main.ml | 3 ++- src/proto_alpha/lib_client/dune | 1 + src/proto_alpha/lib_client/mockup.ml | 4 ++-- src/proto_alpha/lib_client/protocol_client_context.ml | 6 ------ src/proto_alpha/lib_client/proxy.ml | 2 +- src/proto_alpha/lib_delegate/dune | 2 ++ 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 6d4ba021369f..2bcf8e723d37 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -5482,7 +5482,7 @@ let hash = Protocol.hash octez_shell_services |> open_; octez_client_base |> open_; main |> open_; - lifted; + lifted |> open_if N.(number >= 018); octez_mockup_registration |> if_ N.(number >= 011); octez_proxy |> if_ N.(number >= 011); octez_signer_backends |> if_ N.(number >= 001); @@ -5689,6 +5689,7 @@ let hash = Protocol.hash octez_clic; octez_version; main |> open_; + lifted |> if_ N.(number >= 018) |> open_; plugin |> if_some |> open_; octez_protocol_environment; octez_shell_services |> open_; diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 07fc2e4a7c4d..a3782b240c51 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -30,6 +30,7 @@ -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_alpha + -open Tezos_protocol_alpha_lifted -open Tezos_protocol_plugin_alpha -open Tezos_protocol_alpha_parameters -open Tezos_smart_rollup_alpha)) diff --git a/src/proto_alpha/lib_client/mockup.ml b/src/proto_alpha/lib_client/mockup.ml index 31f3685e652c..8ba8d4ccfd2f 100644 --- a/src/proto_alpha/lib_client/mockup.ml +++ b/src/proto_alpha/lib_client/mockup.ml @@ -570,7 +570,7 @@ let migrate : module M : Tezos_mockup_registration.Registration_intf.MOCKUP - with module Protocol = Protocol_client_context.Lifted_protocol = struct + with module Protocol = Lifted_protocol = struct type parameters = Protocol_parameters.t type protocol_constants = Protocol_constants_overrides.t @@ -587,7 +587,7 @@ module M : let protocol_hash = Protocol.hash - module Protocol = Protocol_client_context.Lifted_protocol + module Protocol = Lifted_protocol module Block_services = Protocol_client_context.Alpha_block_services let directory = Plugin.RPC.rpc_services diff --git a/src/proto_alpha/lib_client/protocol_client_context.ml b/src/proto_alpha/lib_client/protocol_client_context.ml index 595283dd48d8..abb8c7903981 100644 --- a/src/proto_alpha/lib_client/protocol_client_context.ml +++ b/src/proto_alpha/lib_client/protocol_client_context.ml @@ -23,12 +23,6 @@ (* *) (*****************************************************************************) -module Lifted_protocol = struct - include Environment.Lift (Protocol) - - let hash = Protocol.hash -end - module Alpha_block_services = Block_services.Make (Lifted_protocol) (Lifted_protocol) diff --git a/src/proto_alpha/lib_client/proxy.ml b/src/proto_alpha/lib_client/proxy.ml index ba6d01b6a7c5..e281a115246e 100644 --- a/src/proto_alpha/lib_client/proxy.ml +++ b/src/proto_alpha/lib_client/proxy.ml @@ -159,7 +159,7 @@ let round_durations (rpc_context : Tezos_rpc.Context.generic) let () = let open Tezos_proxy.Registration in let module M : Proxy_sig = struct - module Protocol = Protocol_client_context.Lifted_protocol + module Protocol = Lifted_protocol let protocol_hash = Protocol.hash diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index ada7a99bf5a5..a0aaf319b93b 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -10,6 +10,7 @@ tezos-clic tezos-version tezos-protocol-alpha + tezos-protocol-alpha.lifted tezos-protocol-plugin-alpha tezos-protocol-environment tezos-shell-services @@ -35,6 +36,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_alpha + -open Tezos_protocol_alpha_lifted -open Tezos_protocol_plugin_alpha -open Tezos_shell_services -open Tezos_client_base -- GitLab