Skip to content

Commit

Permalink
remove configs and overrides for unsupported testnets
Browse files Browse the repository at this point in the history
  • Loading branch information
arvidn committed May 30, 2024
1 parent f5366ff commit 611147f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 107 deletions.
29 changes: 0 additions & 29 deletions chia/_tests/util/test_testnet_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@
from chia.consensus.default_constants import update_testnet_overrides


def test_testnet10() -> None:
overrides: Dict[str, Any] = {}
update_testnet_overrides("testnet10", overrides)
assert overrides == {
"SOFT_FORK4_HEIGHT": 4465000,
"HARD_FORK_HEIGHT": 2997292,
"PLOT_FILTER_128_HEIGHT": 3061804,
"PLOT_FILTER_64_HEIGHT": 8010796,
"PLOT_FILTER_32_HEIGHT": 13056556,
}


def test_testnet11() -> None:
overrides: Dict[str, Any] = {}
update_testnet_overrides("testnet11", overrides)
Expand All @@ -25,23 +13,6 @@ def test_testnet11() -> None:
}


def test_testnet10_existing() -> None:
overrides: Dict[str, Any] = {
"HARD_FORK_HEIGHT": 42,
"PLOT_FILTER_128_HEIGHT": 42,
"PLOT_FILTER_64_HEIGHT": 42,
"PLOT_FILTER_32_HEIGHT": 42,
}
update_testnet_overrides("testnet10", overrides)
assert overrides == {
"SOFT_FORK4_HEIGHT": 4465000,
"HARD_FORK_HEIGHT": 42,
"PLOT_FILTER_128_HEIGHT": 42,
"PLOT_FILTER_64_HEIGHT": 42,
"PLOT_FILTER_32_HEIGHT": 42,
}


def test_mainnet() -> None:
overrides: Dict[str, Any] = {}
update_testnet_overrides("mainnet", overrides)
Expand Down
13 changes: 0 additions & 13 deletions chia/consensus/default_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,6 @@


def update_testnet_overrides(network_id: str, overrides: Dict[str, Any]) -> None:
if network_id == "testnet10":
# activate softforks immediately on testnet
# these numbers are supposed to match initial-config.yaml
if "SOFT_FORK4_HEIGHT" not in overrides:
overrides["SOFT_FORK4_HEIGHT"] = 4465000
if "HARD_FORK_HEIGHT" not in overrides:
overrides["HARD_FORK_HEIGHT"] = 2997292
if "PLOT_FILTER_128_HEIGHT" not in overrides:
overrides["PLOT_FILTER_128_HEIGHT"] = 3061804
if "PLOT_FILTER_64_HEIGHT" not in overrides:
overrides["PLOT_FILTER_64_HEIGHT"] = 8010796
if "PLOT_FILTER_32_HEIGHT" not in overrides:
overrides["PLOT_FILTER_32_HEIGHT"] = 13056556
if network_id == "testnet11":
if "SOFT_FORK4_HEIGHT" not in overrides:
overrides["SOFT_FORK4_HEIGHT"] = 641500
65 changes: 0 additions & 65 deletions chia/util/initial-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,71 +18,6 @@ network_overrides: &network_overrides
GENESIS_CHALLENGE: ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: "d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc"
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: "3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af"
testnet0:
MIN_PLOT_SIZE: 18
GENESIS_CHALLENGE: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: "d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc"
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: "3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af"
testnet2:
MIN_PLOT_SIZE: 18
GENESIS_CHALLENGE: ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: "d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc"
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: "3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af"
testnet3:
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
GENESIS_CHALLENGE: ca7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015af
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc
MIN_PLOT_SIZE: 18
MEMPOOL_BLOCK_BUFFER: 10
testnet4:
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
GENESIS_CHALLENGE: dd7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015af
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc
MIN_PLOT_SIZE: 18
MEMPOOL_BLOCK_BUFFER: 10
EPOCH_BLOCKS: 768
DIFFICULTY_STARTING: 30
testnet5:
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
GENESIS_CHALLENGE: ee7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015af
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc
MIN_PLOT_SIZE: 18
MEMPOOL_BLOCK_BUFFER: 10
EPOCH_BLOCKS: 768
DIFFICULTY_STARTING: 30
testnet7:
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
GENESIS_CHALLENGE: 117816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015af
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc
MIN_PLOT_SIZE: 18
MEMPOOL_BLOCK_BUFFER: 50
EPOCH_BLOCKS: 768
DIFFICULTY_STARTING: 30
testnet10:
AGG_SIG_ME_ADDITIONAL_DATA: ae83525ba8d1dd3f09b277de18ca3e43fc0af20d20c4b3e92ef2a48bd291ccb2
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
DIFFICULTY_STARTING: 30
EPOCH_BLOCKS: 768
GENESIS_CHALLENGE: ae83525ba8d1dd3f09b277de18ca3e43fc0af20d20c4b3e92ef2a48bd291ccb2
GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af
GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc
MEMPOOL_BLOCK_BUFFER: 10
MIN_PLOT_SIZE: 18
SOFT_FORK4_HEIGHT: 4465000
# planned 2.0 release is July 26, height 2965036 on testnet
# 1 week later
HARD_FORK_HEIGHT: 2997292
# another 2 weeks later
PLOT_FILTER_128_HEIGHT: 3061804
# 3 years later
PLOT_FILTER_64_HEIGHT: 8010796
# 3 years later
PLOT_FILTER_32_HEIGHT: 13056556
testnet11:
AGG_SIG_ME_ADDITIONAL_DATA: 37a90eb5185a9c4439a91ddc98bbadce7b4feba060d50116a067de66bf236615
DIFFICULTY_CONSTANT_FACTOR: 10052721566054
Expand Down

0 comments on commit 611147f

Please sign in to comment.