From 3a81506dc7a513265afbae61e19bcfa16a013beb Mon Sep 17 00:00:00 2001
From: Earle Lowe <30607889+emlowe@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:52:46 -0700
Subject: [PATCH] Update soft for height in main for testnet to 2997292
 (#15872)

* Update soft for height in main for testnet

* More updates to SOFT_FORK3_HEIGHT
---
 chia/server/start_full_node.py       |  2 +-
 chia/util/initial-config.yaml        | 10 +++++-----
 tests/util/test_testnet_overrides.py |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chia/server/start_full_node.py b/chia/server/start_full_node.py
index 10cee1c01497..beac5d7869ae 100644
--- a/chia/server/start_full_node.py
+++ b/chia/server/start_full_node.py
@@ -75,7 +75,7 @@ def update_testnet_overrides(network_id: str, overrides: Dict[str, Any]) -> None
     if "SOFT_FORK2_HEIGHT" not in overrides:
         overrides["SOFT_FORK2_HEIGHT"] = 0
     if "SOFT_FORK3_HEIGHT" not in overrides:
-        overrides["SOFT_FORK3_HEIGHT"] = 2960728
+        overrides["SOFT_FORK3_HEIGHT"] = 2997292
     if "HARD_FORK_HEIGHT" not in overrides:
         overrides["HARD_FORK_HEIGHT"] = 2997292
     if "PLOT_FILTER_128_HEIGHT" not in overrides:
diff --git a/chia/util/initial-config.yaml b/chia/util/initial-config.yaml
index 82f01c280ff5..d4592572b745 100644
--- a/chia/util/initial-config.yaml
+++ b/chia/util/initial-config.yaml
@@ -72,16 +72,16 @@ network_overrides: &network_overrides
       MEMPOOL_BLOCK_BUFFER: 10
       MIN_PLOT_SIZE: 18
       SOFT_FORK2_HEIGHT: 0
-      SOFT_FORK3_HEIGHT: 0
+      SOFT_FORK3_HEIGHT: 2997292
       # planned 2.0 release is July 26, height 2965036 on testnet
       # 1 week later
-      HARD_FORK_HEIGHT": 2997292
+      HARD_FORK_HEIGHT: 2997292
       # another 2 weeks later
-      PLOT_FILTER_128_HEIGHT": 3061804
+      PLOT_FILTER_128_HEIGHT: 3061804
       # 3 years later
-      PLOT_FILTER_64_HEIGHT": 8010796
+      PLOT_FILTER_64_HEIGHT: 8010796
       # 3 years later
-      PLOT_FILTER_32_HEIGHT": 13056556
+      PLOT_FILTER_32_HEIGHT: 13056556
   config:
     mainnet:
       address_prefix: "xch"
diff --git a/tests/util/test_testnet_overrides.py b/tests/util/test_testnet_overrides.py
index 17887aa254a3..0a6a2adfbee1 100644
--- a/tests/util/test_testnet_overrides.py
+++ b/tests/util/test_testnet_overrides.py
@@ -10,7 +10,7 @@ def test_testnet10() -> None:
     update_testnet_overrides("testnet10", overrides)
     assert overrides == {
         "SOFT_FORK2_HEIGHT": 0,
-        "SOFT_FORK3_HEIGHT": 2960728,
+        "SOFT_FORK3_HEIGHT": 2997292,
         "HARD_FORK_HEIGHT": 2997292,
         "PLOT_FILTER_128_HEIGHT": 3061804,
         "PLOT_FILTER_64_HEIGHT": 8010796,