mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 14:59:39 -04:00
Drop testnet3 from docs and dev tools
Also use "test network" instead of "testnet" where appropriate (e.g. because it also applies to signet).
This commit is contained in:
parent
6125f46e14
commit
78a53c79ed
8 changed files with 7 additions and 21 deletions
|
@ -73,9 +73,6 @@ cat >> "${EXAMPLE_CONF_FILE}" << 'EOF'
|
|||
# Options for mainnet
|
||||
[main]
|
||||
|
||||
# Options for testnet3
|
||||
[test]
|
||||
|
||||
# Options for testnet4
|
||||
[testnet4]
|
||||
|
||||
|
|
|
@ -7,9 +7,6 @@ host=127.0.0.1
|
|||
#mainnet default
|
||||
port=8332
|
||||
|
||||
#testnet default
|
||||
#port=18332
|
||||
|
||||
#regtest default
|
||||
#port=18443
|
||||
|
||||
|
@ -26,11 +23,6 @@ netmagic=f9beb4d9
|
|||
genesis=000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
|
||||
input=/home/example/.bitcoin/blocks
|
||||
|
||||
# testnet
|
||||
#netmagic=0b110907
|
||||
#genesis=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943
|
||||
#input=/home/example/.bitcoin/testnet3/blocks
|
||||
|
||||
# regtest
|
||||
#netmagic=fabfb5da
|
||||
#genesis=0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206
|
||||
|
|
|
@ -3,7 +3,7 @@ Unauthenticated REST Interface
|
|||
|
||||
The REST API can be enabled with the `-rest` option.
|
||||
|
||||
The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet, port 18332 for testnet,
|
||||
The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet,
|
||||
port 48332 for testnet4, port 38332 for signet, and port 18443 for regtest.
|
||||
|
||||
REST Interface consistency guarantees
|
||||
|
|
|
@ -41,7 +41,7 @@ Comments may appear in two ways:
|
|||
### Network specific options
|
||||
|
||||
Network specific options can be:
|
||||
- placed into sections with headers `[main]` (not `[mainnet]`), `[test]` (not `[testnet]`, for testnet3), `[testnet4]`, `[signet]` or `[regtest]`;
|
||||
- placed into sections with headers `[main]` (not `[mainnet]`), `[testnet4]`, `[signet]` or `[regtest]`;
|
||||
- prefixed with a chain name; e.g., `regtest.maxmempool=100`.
|
||||
|
||||
Network specific options take precedence over non-network specific options.
|
||||
|
|
|
@ -37,7 +37,6 @@ Windows | `%LOCALAPPDATA%\Bitcoin\` <sup>[\[1\]](#note1)</sup>
|
|||
Chain option | Data directory path
|
||||
---------------------------------|------------------------------
|
||||
`-chain=main` (default) | *path_to_datadir*`/`
|
||||
`-chain=test` or `-testnet` | *path_to_datadir*`/testnet3/`
|
||||
`-chain=testnet4` or `-testnet4` | *path_to_datadir*`/testnet4/`
|
||||
`-chain=signet` or `-signet` | *path_to_datadir*`/signet/`
|
||||
`-chain=regtest` or `-regtest` | *path_to_datadir*`/regtest/`
|
||||
|
|
|
@ -313,14 +313,12 @@ Both variables are used as a guideline for how much space the user needs on thei
|
|||
Note that all values should be taken from a **fully synced** node and have an overhead of 5-10% added on top of its base value.
|
||||
|
||||
To calculate `m_assumed_blockchain_size`, take the size in GiB of these directories:
|
||||
- For `mainnet` -> the data directory, excluding the `/testnet3`, `/testnet4`, `/signet`, and `/regtest` directories and any overly large files, e.g. a huge `debug.log`
|
||||
- For `testnet` -> `/testnet3`
|
||||
- For `mainnet` -> the data directory, excluding the `/testnet4`, `/signet`, and `/regtest` directories and any overly large files, e.g. a huge `debug.log`
|
||||
- For `testnet4` -> `/testnet4`
|
||||
- For `signet` -> `/signet`
|
||||
|
||||
To calculate `m_assumed_chain_state_size`, take the size in GiB of these directories:
|
||||
- For `mainnet` -> `/chainstate`
|
||||
- For `testnet` -> `/testnet3/chainstate`
|
||||
- For `testnet4` -> `/testnet4/chainstate`
|
||||
- For `signet` -> `/signet/chainstate`
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@ WalletDescriptor GenerateWalletDescriptor(const CExtPubKey& master_key, const Ou
|
|||
} // no default case, so the compiler can warn about missing cases
|
||||
assert(!desc_prefix.empty());
|
||||
|
||||
// Mainnet derives at 0', testnet and regtest derive at 1'
|
||||
// Mainnet derives at 0', test networks derive at 1'
|
||||
if (Params().IsTestChain()) {
|
||||
desc_prefix += "/1h";
|
||||
} else {
|
||||
|
|
|
@ -187,11 +187,11 @@ def address_to_scriptpubkey(address):
|
|||
"""Converts a given address to the corresponding output script (scriptPubKey)."""
|
||||
version, payload = bech32_to_bytes(address)
|
||||
if version is not None:
|
||||
return program_to_witness_script(version, payload) # testnet segwit scriptpubkey
|
||||
return program_to_witness_script(version, payload) # test network segwit scriptpubkey
|
||||
payload, version = base58_to_byte(address)
|
||||
if version == 111: # testnet pubkey hash
|
||||
if version == 111: # test network pubkey hash
|
||||
return keyhash_to_p2pkh_script(payload)
|
||||
elif version == 196: # testnet script hash
|
||||
elif version == 196: # test network script hash
|
||||
return scripthash_to_p2sh_script(payload)
|
||||
# TODO: also support other address formats
|
||||
else:
|
||||
|
|
Loading…
Add table
Reference in a new issue