diff --git a/chia-blockchain-gui b/chia-blockchain-gui index 12b9f07c9c..7246f08f62 160000 --- a/chia-blockchain-gui +++ b/chia-blockchain-gui @@ -1 +1 @@ -Subproject commit 12b9f07c9c1e0da33ded0460e6b0ac064beab1f9 +Subproject commit 7246f08f62d1bd5a43fbcfcd5e627d4c1c011c7e diff --git a/src/cmds/init.py b/src/cmds/init.py index fdf6398633..6b9c299261 100644 --- a/src/cmds/init.py +++ b/src/cmds/init.py @@ -377,25 +377,10 @@ def chia_init(root_path: Path): manifest = MANIFEST - # Migrates rc1 - rc1_path = Path(os.path.expanduser("~/.chia/1.0rc1")) - if rc1_path.is_dir(): - r = migrate_from(rc1_path, root_path, manifest, DO_NOT_MIGRATE_SETTINGS) - if r: - check_keys(root_path) - return 0 - - # Migrates windows beta27 - b27_windows_path = Path(os.path.expanduser("~/.chia/beta-0.1.27")) - if b27_windows_path.is_dir(): - r = migrate_from(b27_windows_path, root_path, manifest, DO_NOT_MIGRATE_SETTINGS) - if r: - check_keys(root_path) - return 0 - - # Version 19 is the first version that used the bech32m addresses - for version_number in range(27, 18, -1): - old_path = Path(os.path.expanduser("~/.chia/beta-1.0b%s" % version_number)) + # Starting with RC2 is the first version that used the bech32m addresses + # range current version and 0=version 1 + for version_number in range(chia_minor_release_number() - 1, 0, -1): + old_path = Path(os.path.expanduser("~/.chia/1.0rc%s" % version_number)) print(f"Checking {old_path}") # This is reached if the user has updated the application, and therefore a new configuration # folder must be used. First we migrate the config fies, and then we migrate the private keys. diff --git a/src/consensus/default_constants.py b/src/consensus/default_constants.py index 8350df2034..99c8489e01 100644 --- a/src/consensus/default_constants.py +++ b/src/consensus/default_constants.py @@ -57,7 +57,7 @@ testnet_kwargs = { "BLOCKS_CACHE_SIZE": 5000, # todo almog BLOCKS_CACHE_SIZE = EPOCH_BLOCKS + 3*MAX_SUB_SLOT_BLOCKS" "WEIGHT_PROOF_RECENT_BLOCKS": 800, "MAX_BLOCK_COUNT_PER_REQUESTS": 32, # Allow up to 32 blocks per request - "INITIAL_FREEZE_PERIOD": 10000, # Transaction are disabled first 10000 blocks + "INITIAL_FREEZE_PERIOD": 5000, # Transaction are disabled first 10000 blocks "NETWORK": 0, "MAX_GENERATOR_SIZE": 1000000, } diff --git a/src/util/initial-config.yaml b/src/util/initial-config.yaml index aa2bdf3ee2..2ffa220a78 100644 --- a/src/util/initial-config.yaml +++ b/src/util/initial-config.yaml @@ -214,7 +214,7 @@ full_node: host: *self_hostname port: 8446 introducer_peer: - host: introducer.beta.chia.net # Chia AWS introducer IPv4/IPv6 + host: introducer1.beta.chia.net # Chia AWS introducer IPv4/IPv6 port: 58444 wallet_peer: host: *self_hostname @@ -296,7 +296,7 @@ wallet: recent_peer_threshold: 6000 introducer_peer: - host: introducer.beta.chia.net # Chia AWS introducer IPv4/IPv6 + host: introducer1.beta.chia.net # Chia AWS introducer IPv4/IPv6 port: 58444 ssl: