From c7de614e83d27ec916b72c62ba2fd0200813bb57 Mon Sep 17 00:00:00 2001
From: William Smith <williamprincesmith@gmail.com>
Date: Wed, 24 Jul 2024 18:39:41 -0400
Subject: [PATCH] [StateAccumulator] Remove v2 disable functionality from node
 config (#18786)

## Description

Before removing v1, we need to ensure that no one has v2 force disabled,
as it would otherwise lead to a fork during upgrade due to forcing v2 to
be enabled mid-epoch.

## Test plan

How did you test the new or updated feature?

---

## Release notes

Check each box that your changes affect. If none of the boxes relate to
your changes, release notes aren't required.

For each box you select, include information after the relevant heading
that describes the impact of your changes that a user might notice and
any actions they must take to implement updates.

- [ ] Protocol:
- [ ] Nodes (Validators and Full nodes):
- [ ] Indexer:
- [ ] JSON-RPC:
- [ ] GraphQL:
- [ ] CLI:
- [ ] Rust SDK:
- [ ] REST API:
---
 crates/sui-config/src/node.rs                             | 2 ++
 .../snapshot_tests__network_config_snapshot_matches.snap  | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/crates/sui-config/src/node.rs b/crates/sui-config/src/node.rs
index c6db0d850d424..80ae3dd0a6fb1 100644
--- a/crates/sui-config/src/node.rs
+++ b/crates/sui-config/src/node.rs
@@ -186,6 +186,8 @@ pub struct NodeConfig {
     #[serde(default)]
     pub execution_cache: ExecutionCacheConfig,
 
+    // step 1 in removing the old state accumulator
+    #[serde(skip)]
     #[serde(default = "bool_true")]
     pub state_accumulator_v2: bool,
 
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
index b2519d82910dd..61811145ed2a6 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -138,7 +138,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
   - protocol-key-pair:
@@ -276,7 +275,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
   - protocol-key-pair:
@@ -414,7 +412,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
   - protocol-key-pair:
@@ -552,7 +549,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
   - protocol-key-pair:
@@ -690,7 +686,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
   - protocol-key-pair:
@@ -828,7 +823,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
   - protocol-key-pair:
@@ -966,7 +960,6 @@ validator_configs:
       max-transaction-manager-queue-length: 100000
       max-transaction-manager-per-object-queue-length: 100
     execution-cache: passthrough-cache
-    state-accumulator-v2: true
     enable-soft-bundle: true
     enable-validator-tx-finalizer: true
 account_keys:
@@ -976,3 +969,4 @@ account_keys:
   - mfPjCoE6SX0Sl84MnmNS/LS+tfPpkn7I8tziuk2g0WM=
   - 5RWlYF22jS9i76zLl8jP2D3D8GC5ht+IP1dWUBGZxi8=
 genesis: "[fake genesis]"
+