Bump chia rs 0.16.0 (#18878)

* bump chia_rs dependency to 0.16.0 * add placeholder activation height for soft-fork 6
Chia-Network · Nov 19, 2024 · 1c12526 · 1c12526
1 parent 748c8ce
commit 1c12526
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 35 deletions.
diff --git a/chia/_tests/conftest.py b/chia/_tests/conftest.py
@@ -212,7 +212,7 @@ def blockchain_constants(consensus_mode: ConsensusMode) -> ConsensusConstants:
         )
     if consensus_mode >= ConsensusMode.SOFT_FORK_5:
         ret = ret.replace(
-            SOFT_FORK5_HEIGHT=uint32(2),
+            SOFT_FORK6_HEIGHT=uint32(2),
         )
     return ret
 

diff --git a/chia/_tests/util/test_replace_str_to_bytes.py b/chia/_tests/util/test_replace_str_to_bytes.py
@@ -56,7 +56,7 @@
     MAX_GENERATOR_SIZE=uint32(1000000),
     MAX_GENERATOR_REF_LIST_SIZE=uint32(512),
     POOL_SUB_SLOT_ITERS=uint64(37600000000),
-    SOFT_FORK5_HEIGHT=uint32(5940000),
+    SOFT_FORK6_HEIGHT=uint32(9999999),
     HARD_FORK_HEIGHT=uint32(5496000),
     PLOT_FILTER_128_HEIGHT=uint32(10542000),
     PLOT_FILTER_64_HEIGHT=uint32(15592000),

diff --git a/chia/_tests/util/test_testnet_overrides.py b/chia/_tests/util/test_testnet_overrides.py
@@ -9,7 +9,7 @@ def test_testnet11() -> None:
     overrides: dict[str, Any] = {}
     update_testnet_overrides("testnet11", overrides)
     assert overrides == {
-        "SOFT_FORK5_HEIGHT": 1340000,
+        "SOFT_FORK6_HEIGHT": 9999999,
     }
 
 

diff --git a/chia/consensus/default_constants.py b/chia/consensus/default_constants.py
@@ -72,7 +72,7 @@
     MAX_GENERATOR_SIZE=uint32(1000000),
     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_FORK5_HEIGHT=uint32(5940000),
+    SOFT_FORK6_HEIGHT=uint32(9999999),  # temporary placeholder
     # June 2024
     HARD_FORK_HEIGHT=uint32(5496000),
     # June 2027
@@ -86,5 +86,5 @@
 
 def update_testnet_overrides(network_id: str, overrides: dict[str, Any]) -> None:
     if network_id == "testnet11":
-        if "SOFT_FORK5_HEIGHT" not in overrides:
-            overrides["SOFT_FORK5_HEIGHT"] = 1340000
+        if "SOFT_FORK6_HEIGHT" not in overrides:
+            overrides["SOFT_FORK6_HEIGHT"] = 9999999  # temporary placeholder
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ bitstring = "4.1.4"  # Binary data management library
 boto3 = "1.35.43"  # AWS S3 for Data Layer S3 plugin
 chiabip158 = "1.5.1"  # bip158-style wallet filters
 chiapos = "2.0.7"  # proof of space
-chia_rs = "0.15.0"
+chia_rs = "0.16.0"
 chiavdf = "1.1.8"  # timelord and vdf verification
 click = "8.1.7"  # For the CLI
 clvm = "0.9.11"