From 06232a22fbb58baf3bd5746784c79ca29efe8c0f Mon Sep 17 00:00:00 2001
From: Mark Logan <103447440+mystenmark@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:01:26 -0700
Subject: [PATCH] Re-order flags to match order in v1.28 (#18682)

---
 .../authority/epoch_start_configuration.rs    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/crates/sui-core/src/authority/epoch_start_configuration.rs b/crates/sui-core/src/authority/epoch_start_configuration.rs
index e96a10ebb1b0c..59c445f57218d 100644
--- a/crates/sui-core/src/authority/epoch_start_configuration.rs
+++ b/crates/sui-core/src/authority/epoch_start_configuration.rs
@@ -41,24 +41,32 @@ pub trait EpochStartConfigTrait {
     }
 }
 
+// IMPORTANT: Assign explicit values to each variant to ensure that the values are stable.
+// When cherry-picking changes from one branch to another, the value of variants must never
+// change.
+//
+// Unlikely: If you cherry pick a change from one branch to another, and there is a collision
+// in the value of some variant, the branch which has been released should take precedence.
+// In this case, the picked-from branch is inconsistent with the released branch, and must
+// be fixed.
 #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 pub enum EpochFlag {
     // The deprecated flags have all been in production for long enough that
     // we can have deleted the old code paths they were guarding.
     // We retain them here in order not to break deserialization.
-    _InMemoryCheckpointRootsDeprecated,
-    _PerEpochFinalizedTransactionsDeprecated,
-    _ObjectLockSplitTablesDeprecated,
+    _InMemoryCheckpointRootsDeprecated = 0,
+    _PerEpochFinalizedTransactionsDeprecated = 1,
+    _ObjectLockSplitTablesDeprecated = 2,
 
-    WritebackCacheEnabled,
+    WritebackCacheEnabled = 3,
 
     // This flag was "burned" because it was deployed with a broken version of the code. The
     // new flags below are required to enable state accumulator v2
-    _StateAccumulatorV2EnabledDeprecated,
-    StateAccumulatorV2EnabledTestnet,
-    StateAccumulatorV2EnabledMainnet,
+    _StateAccumulatorV2EnabledDeprecated = 4,
+    StateAccumulatorV2EnabledTestnet = 5,
+    StateAccumulatorV2EnabledMainnet = 6,
 
-    ExecutedInEpochTable,
+    ExecutedInEpochTable = 7,
 }
 
 impl EpochFlag {