checkpoint: into main from release/2.3.0 @ 861280f (#17948)

Source hash: 861280f Remaining commits: 5
Chia-Network · May 2, 2024 · 972da35 · 972da35
2 parents 8cedf54 + 1a69bd2
commit 972da35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/chia/_tests/conftest.py b/chia/_tests/conftest.py
@@ -264,7 +264,7 @@ def db_version(request) -> int:
     return request.param
 
 
-SOFTFORK_HEIGHTS = [1000000, 5496000, 5496100, 5650000]
+SOFTFORK_HEIGHTS = [1000000, 5496000, 5496100, 5716000]
 
 
 @pytest.fixture(scope="function", params=SOFTFORK_HEIGHTS)

diff --git a/chia/consensus/default_constants.py b/chia/consensus/default_constants.py
@@ -63,7 +63,7 @@
     MAX_GENERATOR_REF_LIST_SIZE=uint32(512),  # Number of references allowed in the block generator ref list
     POOL_SUB_SLOT_ITERS=uint64(37600000000),  # iters limit * NUM_SPS
     SOFT_FORK2_HEIGHT=uint32(0),
-    SOFT_FORK4_HEIGHT=uint32(5650000),
+    SOFT_FORK4_HEIGHT=uint32(5716000),
     # June 2024
     HARD_FORK_HEIGHT=uint32(5496000),
     HARD_FORK_FIX_HEIGHT=uint32(5496000),