Prepare for RC3, TX lock to 5000, fix init for RC (#1045)

* Correct gui submodule

* "- 1"
This commit is contained in:
Gene Hoffman
2021-02-24 16:33:43 -08:00
committed by GitHub
parent 16d4f166a5
commit 8feeb075fc
4 changed files with 8 additions and 23 deletions
+4 -19
View File
@@ -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.
+1 -1
View File
@@ -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,
}
+2 -2
View File
@@ -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: