From 8b4f999cc6c9dc9091085dbebed9158131b10016 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Tue, 19 Nov 2024 15:28:40 +0100 Subject: [PATCH] Alpha: activate environment V14 --- docs/alpha/validation.rst | 4 ++-- docs/protocols/alpha.rst | 2 ++ src/bin_client/test/proto_test_injection/TEZOS_PROTOCOL | 2 +- src/lib_store/unix/test/test_consistency.ml | 2 +- src/proto_alpha/lib_protocol/TEZOS_PROTOCOL | 2 +- src/proto_alpha/lib_protocol/dune | 2 +- tezt/tests/voting.ml | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/alpha/validation.rst b/docs/alpha/validation.rst index 8344a54e7fbb..961bf24af528 100644 --- a/docs/alpha/validation.rst +++ b/docs/alpha/validation.rst @@ -67,9 +67,9 @@ 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>` ``V13``, and it is +environment<../shell/protocol_environment>` ``V14``, and it is implemented by this protocol in the :package-api:`Main` module. diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index f32c44340e52..4e42a4e2bcd9 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -12,6 +12,8 @@ branch of Octez. Environment Version ------------------- +This protocol requires a different protocol environment version than Quebec. +It requires protocol environment V14, compared to V13 for Quebec. Smart Rollups diff --git a/src/bin_client/test/proto_test_injection/TEZOS_PROTOCOL b/src/bin_client/test/proto_test_injection/TEZOS_PROTOCOL index 2a74b71c789a..7064a4e2fc99 100644 --- a/src/bin_client/test/proto_test_injection/TEZOS_PROTOCOL +++ b/src/bin_client/test/proto_test_injection/TEZOS_PROTOCOL @@ -1,4 +1,4 @@ { "modules": ["Main"], - "expected_env_version": 13 + "expected_env_version": 14 } diff --git a/src/lib_store/unix/test/test_consistency.ml b/src/lib_store/unix/test/test_consistency.ml index 3cb1e8366681..ff525f6f6119 100644 --- a/src/lib_store/unix/test/test_consistency.ml +++ b/src/lib_store/unix/test/test_consistency.ml @@ -39,7 +39,7 @@ let nb_protocols = 5 let register_protocol ~hash ~sources = let module M = struct include - Registered_protocol.Register_embedded_V13 + Registered_protocol.Register_embedded_V14 (Tezos_protocol_environment_demo_noops) (Tezos_protocol_demo_noops.Protocol) (struct diff --git a/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL b/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL index e4dbd4a6dd40..d311c93e36a1 100644 --- a/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL +++ b/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL @@ -1,5 +1,5 @@ { - "expected_env_version": 13, + "expected_env_version": 14, "hash": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", "modules": [ "Misc", diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index f50c2d3c1c8a..778020f50f67 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.V13.Make(Name)()\n"))) + "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.V14.Make(Name)()\n"))) (library (name tezos_raw_protocol_alpha) diff --git a/tezt/tests/voting.ml b/tezt/tests/voting.ml index 6e81358840b6..31e7a0f829ca 100644 --- a/tezt/tests/voting.ml +++ b/tezt/tests/voting.ml @@ -59,7 +59,7 @@ let test_proto_files = ["main.ml"; "main.mli"] let test_proto_TEZOS_PROTOCOL = {|{ "modules": ["Main"], - "expected_env_version": 13 + "expected_env_version": 14 } |} -- GitLab