diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a46fed81d..9ce1991ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -212,11 +212,9 @@ jobs: ## Testing Checklist (DELETE ME) - - - [ ] Run on synced Pyrmont Sigma Prime nodes. + - [ ] Run on synced Prater Sigma Prime nodes. - [ ] Run on synced Canary (mainnet) Sigma Prime nodes. - - [ ] Resync a Pyrmont node. - [ ] Resync a Prater node. - [ ] Resync a mainnet node. diff --git a/book/src/docker.md b/book/src/docker.md index eec1df26c..9a0378f09 100644 --- a/book/src/docker.md +++ b/book/src/docker.md @@ -110,7 +110,7 @@ You can run a Docker beacon node with the following command: $ docker run -p 9000:9000/tcp -p 9000:9000/udp -p 127.0.0.1:5052:5052 -v $HOME/.lighthouse:/root/.lighthouse sigp/lighthouse lighthouse --network mainnet beacon --http --http-address 0.0.0.0 ``` -> To join the Pyrmont testnet, use `--network pyrmont` instead. +> To join the Prater testnet, use `--network prater` instead. > The `-p` and `-v` and values are described below. diff --git a/book/src/faq.md b/book/src/faq.md index 419f95dcb..02a4bfea6 100644 --- a/book/src/faq.md +++ b/book/src/faq.md @@ -124,7 +124,7 @@ testnet configuration settings. Ensure that the network you wish to connect to is correct (the beacon node outputs the network it is connecting to in the initial boot-up log lines). On top of this, ensure that you are not using the same `datadir` as a previous network. I.e if you have been running the -`pyrmont` testnet and are now trying to join a new testnet but using the same +`prater` testnet and are now trying to join a new testnet but using the same `datadir` (the `datadir` is also printed out in the beacon node's logs on boot-up). diff --git a/book/src/key-management.md b/book/src/key-management.md index 5116bd457..23d11d550 100644 --- a/book/src/key-management.md +++ b/book/src/key-management.md @@ -42,9 +42,9 @@ items, starting at one easy-to-backup mnemonic and ending with multiple keypairs. Creating a single validator looks like this: 1. Create a **wallet** and record the **mnemonic**: - - `lighthouse --network pyrmont account wallet create --name wally --password-file wally.pass` + - `lighthouse --network prater account wallet create --name wally --password-file wally.pass` 1. Create the voting and withdrawal **keystores** for one validator: - - `lighthouse --network pyrmont account validator create --wallet-name wally --wallet-password wally.pass --count 1` + - `lighthouse --network prater account validator create --wallet-name wally --wallet-password wally.pass --count 1` In step (1), we created a wallet in `~/.lighthouse/{network}/wallets` with the name diff --git a/book/src/mainnet-validator.md b/book/src/mainnet-validator.md index bb9a1d218..c5881c606 100644 --- a/book/src/mainnet-validator.md +++ b/book/src/mainnet-validator.md @@ -46,7 +46,7 @@ When using Lighthouse, the `--network` flag selects a network. E.g., - `lighthouse` (no flag): Mainnet. - `lighthouse --network mainnet`: Mainnet. -- `lighthouse --network pyrmont`: Pyrmont (testnet). +- `lighthouse --network prater`: Prater (testnet). Using the correct `--network` flag is very important; using the wrong flag can result in penalties, slashings or lost deposits. As a rule of thumb, always diff --git a/book/src/testnet-validator.md b/book/src/testnet-validator.md index 22ea418f6..0bcd58c9a 100644 --- a/book/src/testnet-validator.md +++ b/book/src/testnet-validator.md @@ -1,7 +1,6 @@ # Become a Testnet Validator [mainnet-validator]: ./mainnet-validator.md -[pyrmont-launchpad]: https://pyrmont.launchpad.ethereum.org/ [prater-launchpad]: https://prater.launchpad.ethereum.org/ Joining an Eth2 testnet is a great way to get familiar with staking in Phase 0. All users should @@ -11,15 +10,12 @@ To join a testnet, you can follow the [Become an Eth2 Mainnet Validator][mainnet instructions but with a few differences: 1. Use the appropriate Eth2 launchpad website: - - [Pyrmont][pyrmont-launchpad] - [Prater][prater-launchpad] 1. Instead of `--network mainnet`, use the appropriate network flag: - - `--network pyrmont`: Pyrmont. - `--network prater`: Prater. 1. Use a Goerli Eth1 node instead of a mainnet one: - For Geth, this means using `geth --goerli --http`. 1. Notice that Lighthouse will store its files in a different directory by default: - - `~/.lighthouse/pyrmont`: Pyrmont. - `~/.lighthouse/prater`: Prater. > diff --git a/book/src/validator-create.md b/book/src/validator-create.md index 91af60078..e7c316a95 100644 --- a/book/src/validator-create.md +++ b/book/src/validator-create.md @@ -50,8 +50,7 @@ OPTIONS: The GWEI value of the deposit amount. Defaults to the minimum amount required for an active validator (MAX_EFFECTIVE_BALANCE) --network - Name of the Eth2 chain Lighthouse will sync and follow. [default: mainnet] [possible values: medalla, - altona, spadina, pyrmont, mainnet, toledo] + Name of the Eth2 chain Lighthouse will sync and follow. [default: mainnet] [possible values: prater, mainnet] --secrets-dir The path where the validator keystore passwords will be stored. Defaults to ~/.lighthouse/{network}/secrets @@ -75,7 +74,7 @@ The example assumes that the `wally` wallet was generated from the [wallet](./wallet-create.md) example. ```bash -lighthouse --network pyrmont account validator create --wallet-name wally --wallet-password wally.pass --count 1 +lighthouse --network prater account validator create --wallet-name wally --wallet-password wally.pass --count 1 ``` This command will: @@ -86,6 +85,6 @@ This command will: - An encrypted keystore containing the validators voting keypair. - An `eth1_deposit_data.rlp` assuming the default deposit amount (`32 ETH` for most testnets and mainnet) which can be submitted to the deposit - contract for the Pyrmont testnet. Other testnets can be set via the + contract for the Prater testnet. Other testnets can be set via the `--network` CLI param. - Store a password to the validators voting keypair in `~/.lighthouse/{network}/secrets`. diff --git a/book/src/voluntary-exit.md b/book/src/voluntary-exit.md index 63f7258fb..593bc9969 100644 --- a/book/src/voluntary-exit.md +++ b/book/src/voluntary-exit.md @@ -39,13 +39,13 @@ The exit phrase is the following: -Below is an example for initiating a voluntary exit on the Pyrmont testnet. +Below is an example for initiating a voluntary exit on the Prater testnet. ``` -$ lighthouse --network pyrmont account validator exit --keystore /path/to/keystore --beacon-node http://localhost:5052 +$ lighthouse --network prater account validator exit --keystore /path/to/keystore --beacon-node http://localhost:5052 -Running account manager for pyrmont network -validator-dir path: ~/.lighthouse/pyrmont/validators +Running account manager for Prater network +validator-dir path: ~/.lighthouse/prater/validators Enter the keystore password for validator in 0xabcd diff --git a/book/src/wallet-create.md b/book/src/wallet-create.md index 3445af4d4..17cac248b 100644 --- a/book/src/wallet-create.md +++ b/book/src/wallet-create.md @@ -59,11 +59,11 @@ OPTIONS: ## Example -Creates a new wallet named `wally` and saves it in `~/.lighthouse/pyrmont/wallets` with a randomly generated password saved +Creates a new wallet named `wally` and saves it in `~/.lighthouse/prater/wallets` with a randomly generated password saved to `./wallet.pass`: ```bash -lighthouse --network pyrmont account wallet create --name wally --password-file wally.pass +lighthouse --network prater account wallet create --name wally --password-file wally.pass ``` > Notes: diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs index fafa15ef8..7c1f5810f 100644 --- a/common/eth2_config/src/lib.rs +++ b/common/eth2_config/src/lib.rs @@ -235,7 +235,6 @@ macro_rules! define_hardcoded_nets { // The directory containing the testnet files should match the human-friendly name (element 1). define_hardcoded_nets!( (mainnet, "mainnet", GENESIS_STATE_IS_KNOWN), - (pyrmont, "pyrmont", GENESIS_STATE_IS_KNOWN), (prater, "prater", GENESIS_STATE_IS_KNOWN), (gnosis, "gnosis", GENESIS_STATE_IS_KNOWN) ); diff --git a/common/eth2_network_config/built_in_network_configs/pyrmont/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/pyrmont/boot_enr.yaml deleted file mode 100644 index 1461179b9..000000000 --- a/common/eth2_network_config/built_in_network_configs/pyrmont/boot_enr.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# @protolambda bootnode 1 -- enr:-Ku4QOA5OGWObY8ep_x35NlGBEj7IuQULTjkgxC_0G1AszqGEA0Wn2RNlyLFx9zGTNB1gdFBA6ZDYxCgIza1uJUUOj4Dh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDVTPWXAAAgCf__________gmlkgnY0gmlwhDQPSjiJc2VjcDI1NmsxoQM6yTQB6XGWYJbI7NZFBjp4Yb9AYKQPBhVrfUclQUobb4N1ZHCCIyg -# @protolambda bootnode 2 -- enr:-Ku4QOksdA2tabOGrfOOr6NynThMoio6Ggka2oDPqUuFeWCqcRM2alNb8778O_5bK95p3EFt0cngTUXm2H7o1jkSJ_8Dh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDVTPWXAAAgCf__________gmlkgnY0gmlwhDaa13aJc2VjcDI1NmsxoQKdNQJvnohpf0VO0ZYCAJxGjT0uwJoAHbAiBMujGjK0SoN1ZHCCIyg -# lighthouse bootnode 1 -- enr:-LK4QDiPGwNomqUqNDaM3iHYvtdX7M5qngson6Qb2xGIg1LwC8-Nic0aQwO0rVbJt5xp32sRE3S1YqvVrWO7OgVNv0kBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpA7CIeVAAAgCf__________gmlkgnY0gmlwhBKNA4qJc2VjcDI1NmsxoQKbBS4ROQ_sldJm5tMgi36qm5I5exKJFb4C8dDVS_otAoN0Y3CCIyiDdWRwgiMo -# lighthouse bootnode 2 -- enr:-LK4QKAezYUw_R4P1vkzfw9qMQQFJvRQy3QsUblWxIZ4FSduJ2Kueik-qY5KddcVTUsZiEO-oZq0LwbaSxdYf27EjckBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpA7CIeVAAAgCf__________gmlkgnY0gmlwhCOmkIaJc2VjcDI1NmsxoQOQgTD4a8-rESfTdbCG0V6Yz1pUvze02jB2Py3vzGWhG4N0Y3CCIyiDdWRwgiMo diff --git a/common/eth2_network_config/built_in_network_configs/pyrmont/config.yaml b/common/eth2_network_config/built_in_network_configs/pyrmont/config.yaml deleted file mode 100644 index 913671c2b..000000000 --- a/common/eth2_network_config/built_in_network_configs/pyrmont/config.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# Pyrmont config - -# Extends the mainnet preset -PRESET_BASE: 'mainnet' - -# Transition -# --------------------------------------------------------------- -# TBD, 2**256-2**10 is a placeholder -TERMINAL_TOTAL_DIFFICULTY: 115792089237316195423570985008687907853269984665640564039457584007913129638912 -# By default, don't use these params -TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000 -TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 - -# Genesis -# --------------------------------------------------------------- -# `2**14` (= 16,384) -MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384 -# Nov 18, 2020, 12pm UTC -MIN_GENESIS_TIME: 1605700800 -# Pyrmont area code -GENESIS_FORK_VERSION: 0x00002009 -# Customized for Pyrmont: 432000 seconds (5 days) -GENESIS_DELAY: 432000 - - -# Forking -# --------------------------------------------------------------- -# Some forks are disabled for now: -# - These may be re-assigned to another fork-version later -# - Temporarily set to max uint64 value: 2**64 - 1 - -# Altair -ALTAIR_FORK_VERSION: 0x01002009 -ALTAIR_FORK_EPOCH: 61650 -# Merge -BELLATRIX_FORK_VERSION: 0x02002009 -BELLATRIX_FORK_EPOCH: 18446744073709551615 -# Sharding -SHARDING_FORK_VERSION: 0x03002009 -SHARDING_FORK_EPOCH: 18446744073709551615 - -# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D. -TRANSITION_TOTAL_DIFFICULTY: 4294967296 - - -# Time parameters -# --------------------------------------------------------------- -# 12 seconds -SECONDS_PER_SLOT: 12 -# 14 (estimate from Eth1 mainnet) -SECONDS_PER_ETH1_BLOCK: 14 -# 2**8 (= 256) epochs ~27 hours -MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256 -# 2**8 (= 256) epochs ~27 hours -SHARD_COMMITTEE_PERIOD: 256 -# 2**11 (= 2,048) Eth1 blocks ~8 hours -ETH1_FOLLOW_DISTANCE: 2048 - - -# Validator cycle -# --------------------------------------------------------------- -# 2**2 (= 4) -INACTIVITY_SCORE_BIAS: 4 -# 2**4 (= 16) -INACTIVITY_SCORE_RECOVERY_RATE: 16 -# 2**4 * 10**9 (= 16,000,000,000) Gwei -EJECTION_BALANCE: 16000000000 -# 2**2 (= 4) -MIN_PER_EPOCH_CHURN_LIMIT: 4 -# 2**16 (= 65,536) -CHURN_LIMIT_QUOTIENT: 65536 - - -# Fork choice -# --------------------------------------------------------------- -# 70% -PROPOSER_SCORE_BOOST: 70 - -# Deposit contract -# --------------------------------------------------------------- -# Ethereum Goerli testnet -DEPOSIT_CHAIN_ID: 5 -DEPOSIT_NETWORK_ID: 5 -# Pyrmont test deposit contract on Goerli (2nd edition, 0x00002009 fork version) -DEPOSIT_CONTRACT_ADDRESS: 0x8c5fecdC472E27Bc447696F431E425D02dd46a8c diff --git a/common/eth2_network_config/built_in_network_configs/pyrmont/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/pyrmont/deploy_block.txt deleted file mode 100644 index 29d19b8ee..000000000 --- a/common/eth2_network_config/built_in_network_configs/pyrmont/deploy_block.txt +++ /dev/null @@ -1 +0,0 @@ -3743587 diff --git a/common/eth2_network_config/built_in_network_configs/pyrmont/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/pyrmont/genesis.ssz.zip deleted file mode 100644 index 3b76c021a..000000000 Binary files a/common/eth2_network_config/built_in_network_configs/pyrmont/genesis.ssz.zip and /dev/null differ diff --git a/common/eth2_network_config/src/lib.rs b/common/eth2_network_config/src/lib.rs index 044548bd6..fa8e1a3dd 100644 --- a/common/eth2_network_config/src/lib.rs +++ b/common/eth2_network_config/src/lib.rs @@ -25,7 +25,7 @@ pub const BASE_CONFIG_FILE: &str = "config.yaml"; // Creates definitions for: // -// - Each of the `HardcodedNet` values (e.g., `MAINNET`, `PYRMONT`, etc). +// - Each of the `HardcodedNet` values (e.g., `MAINNET`, `PRATER`, etc). // - `HARDCODED_NETS: &[HardcodedNet]` // - `HARDCODED_NET_NAMES: &[&'static str]` instantiate_hardcoded_nets!(eth2_config); diff --git a/testing/web3signer_tests/src/lib.rs b/testing/web3signer_tests/src/lib.rs index 4c08ceb7b..d73e4a762 100644 --- a/testing/web3signer_tests/src/lib.rs +++ b/testing/web3signer_tests/src/lib.rs @@ -566,16 +566,6 @@ mod tests { test_altair_types("mainnet", 4243).await } - #[tokio::test] - async fn pyrmont_base_types() { - test_base_types("pyrmont", 4244).await - } - - #[tokio::test] - async fn pyrmont_altair_types() { - test_altair_types("pyrmont", 4245).await - } - #[tokio::test] async fn prater_base_types() { test_base_types("prater", 4246).await