From 89c9e1473f5497bd8f68d1e205053326c1c8972d Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Tue, 23 Apr 2024 09:12:08 +0200 Subject: [PATCH] Proto: Activate environment V13 With V13 newly created, and V20 branch cut, it is time to switch Alpha to use the new environment. This patch follows the procedure described in `protocol_environment_upgrade.rst` and issue #4155. --- docs/alpha/validation.rst | 4 ++-- docs/protocols/alpha.rst | 3 +++ 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, 10 insertions(+), 7 deletions(-) diff --git a/docs/alpha/validation.rst b/docs/alpha/validation.rst index b4ab3a30fc36..84f61b35f317 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>` ``V12``, and it is +environment<../shell/protocol_environment>` ``V13``, 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 1bb5409f72f2..fad561ce2d67 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -14,6 +14,9 @@ branch of Octez. Environment Version ------------------- +This protocol requires a different protocol environment version than Paris. +It requires protocol environment V13, compared to V12 for Paris. + 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 c9e61462b6a4..2a74b71c789a 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": 12 + "expected_env_version": 13 } diff --git a/src/lib_store/unix/test/test_consistency.ml b/src/lib_store/unix/test/test_consistency.ml index 610f9850d6c1..e6d226dc4a4b 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_V12 + Registered_protocol.Register_embedded_V13 (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 355f5509e016..d79b763f6783 100644 --- a/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL +++ b/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL @@ -1,5 +1,5 @@ { - "expected_env_version": 12, + "expected_env_version": 13, "hash": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", "modules": [ "Misc", diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index c99c16b5c140..2813d1b0f374 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.V12.Make(Name)()\n"))) + "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.V13.Make(Name)()\n"))) (library (name tezos_raw_protocol_alpha) diff --git a/tezt/tests/voting.ml b/tezt/tests/voting.ml index d70b6a38a182..fead4d460dd7 100644 --- a/tezt/tests/voting.ml +++ b/tezt/tests/voting.ml @@ -57,7 +57,7 @@ let test_proto_files = ["main.ml"; "main.mli"] let test_proto_TEZOS_PROTOCOL = {|{ "modules": ["Main"], - "expected_env_version": 12 + "expected_env_version": 13 } |} -- GitLab