Fix Docker run -p for both TCP and UDP

docs/Concepts/Weak-Subjectivity.md

@@ -19,12 +19,16 @@ can act dishonestly and continue feeding you blocks to lead you down the wrong c
 
 ## Safely sync your node
 
-Teku provides two methods to safely sync a node that's been offline for an extended period.
+Teku provides two methods to safely sync a node that is new to the network or has been offline for an extended period.
 
-1. Use [`--ws-checkpoint`](../Reference/CLI/CLI-Syntax.md#ws-checkpoint) to supply a weak
-    subjectivity checkpoint from which a node can securely update its view of the current state.
 1. Use [`--initial-state`](../Reference/CLI/CLI-Syntax.md#initial-state) to supply an SSZ encoded
     state file from which to sync.
+2. Use [`--ws-checkpoint`](../Reference/CLI/CLI-Syntax.md#ws-checkpoint) to supply a weak
+    subjectivity checkpoint by which a node can securely validate its view of the current state.
+
+We recommend using `--inital-state`.
+It provides the same security benefits as `--ws-checkpoint`, but syncs faster.
+The only exception is when syncing an archive node, in which case, use `--ws-checkpoint`.
 
 !!! tip
 

docs/HowTo/Find-and-Connect/Improve-Connectivity.md

@@ -4,7 +4,7 @@ title: How to improve P2P connectivity
 
 # Improving P2P connectivity
 
-Ethereum 2.0 relies on peer-to-peer (P2P) networking. By having a good peer count you
+The consensus layer relies on peer-to-peer (P2P) networking. By having a good peer count you
 increase the performance and health of your node. When a Teku node starts up, it looks for
 participants on the P2P network by listening for incoming connections, and finds and connects to
 peers.

docs/HowTo/Get-Started/Connect/Connect-To-Mainnet.md

@@ -4,39 +4,44 @@ description: How to connect to Mainnet
 
 # Connect to Mainnet
 
-The following instructions provide the steps run validators on the Ethereum 2.0 Mainnet. You can
+!!! note
+
+    This documentation has been updated in line with the name changes [recommended by the Ethereum Foundation](https://blog.ethereum.org/2022/01/24/the-great-eth2-renaming/).
+    The execution layer is sometimes known as "Ethereum 1.0." The consensus layer is sometimes known as "Ethereum 2.0."
+
+The following instructions provide the steps run validators on the consensus layer Mainnet. You can
 also use Teku to run a [beacon node only].
 
 !!! warning
 
     If staking funds on the network, the funds are locked until transfers are enabled in a
-    future phase of the Ethereum 2.0 network.
+    future upgrade of the consensus layer.
 
-Use the [ETH2 staking checklist] as a guide to secure your validator keys and hardware.
+Use the [validator checklist] as a guide to secure your validator keys and hardware.
 
 **Prerequisites**:
 
 * Install the latest stable version of Teku using a [binary distribution](../Installation-Options/Install-Binaries.md),
     or with [Docker](../Installation-Options/Run-Docker-Image.md).
-* If running validators, install any Ethereum 1.0 client (for example [Hyperledger Besu]), or access a
+* If running validators, install any execution client (for example [Hyperledger Besu]), or access a
     cloud-based service such as [Infura].
 
 ## Run validators on Mainnet
 
-Ethereum 2.0 validators need to access an Ethereum 1.0 client to onboard new validators.
-New validators make deposits into Ethereum 1.0, and existing Ethereum 2.0 validators must
-process the deposits to allow the new validators to join Ethereum 2.0.
+Consensus layer validators need to access an execution client to onboard new validators.
+New validators make deposits on the execution layer, and existing consensus layer validators must
+process the deposits to allow the new validators to join.
 
-Deposits are made into a deposit contract on the Ethereum 1.0 Mainnet. The deposit contract address
+Deposits are made into a deposit contract on the execution layer Mainnet. The deposit contract address
 is `0x00000000219ab540356cbb839cbe05303d7705fa`.
 
-The steps to run an Ethereum 2.0 validator on Mainnet are:
+The steps to run a consensus layer validator on Mainnet are:
 
-1. If running your own Ethereum 1.0 client, [sync the Ethereum 1.0 network containing
-    the deposit contract](#sync-the-ethereum-10-network).
+1. If running your own execution client, [sync the execution network containing
+    the deposit contract](#sync-the-execution-layer-network).
 
     !!! note
-        This step is only required if running your own Ethereum 1.0 client such as Besu.
+        This step is only required if running your own execution client such as Besu.
         If using a cloud-based service such as Infura, proceed to
         [sync the beacon node](#sync-the-beacon-node).
 
@@ -49,11 +54,11 @@ The steps to run an Ethereum 2.0 validator on Mainnet are:
 
 1. [Start Teku with the validator keys](#start-the-validator).
 
-### Sync the Ethereum 1.0 network
+### Sync the execution layer network
 
-This step is only required if running your own Ethereum 1.0 client.
+This step is only required if running your own execution client.
 
-This example uses Besu to connect to Ethereum 1.0, but any client can be used.
+This example uses Besu as an execution client, but any client can be used.
 Configure Besu to [connect to Mainnet] and expose the RPC-HTTP APIs.
 
 !!! example
@@ -86,7 +91,7 @@ Syncing is complete when the head slot reaches the current slot.
     Ensure your Ethereum account has enough ETH to cover the required deposit amount (32 ETH) plus
     gas.
 
-Use the [Mainnet Launchpad] to guide you through a step-by-step process to generate your keys and
+Use the [Ethereum Staking Launchpad] to guide you through a step-by-step process to generate your keys and
 send the deposits.
 
 !!! note
@@ -184,8 +189,8 @@ to specify the directory to load multiple keys and passwords from.
 
 <!-- links -->
 [connect to Mainnet]: https://besu.hyperledger.org/en/latest/HowTo/Get-Started/Starting-node/#run-a-node-on-ethereum-mainnet
-[Mainnet Launchpad]: https://launchpad.ethereum.org/
-[ETH2 staking checklist]: https://launchpad.ethereum.org/checklist
+[Ethereum Staking Launchpad]: https://launchpad.ethereum.org/
+[validator checklist]: https://launchpad.ethereum.org/checklist
 [running beacon]: #sync-the-beacon-node
 [single process]: #run-the-validator-and-beacon-node-as-a-single-process
 [separate machine]: #run-the-validator-on-a-separate-machine

docs/HowTo/Get-Started/Connect/Connect-To-Testnet.md

@@ -4,7 +4,12 @@ description: How to connect to a testnet
 
 # Connect to a testnet
 
-The following instructions describe the process to connect Teku to an Ethereum 2.0 testnet.
+!!! note
+
+    This documentation has been updated in line with the name changes [recommended by the Ethereum Foundation](https://blog.ethereum.org/2022/01/24/the-great-eth2-renaming/).
+    The execution layer is sometimes known as "Ethereum 1.0." The consensus layer is sometimes known as "Ethereum 2.0."
+
+The following instructions describe the process to connect Teku to a consensus layer testnet.
 
 !!! important
 
@@ -19,31 +24,31 @@ The following instructions describe the process to connect Teku to an Ethereum 2
 
 * Install the latest stable version of Teku using a [binary distribution](../Installation-Options/Install-Binaries.md),
     or with [Docker](../Installation-Options/Run-Docker-Image.md).
-* If running validators, install any Ethereum 1.0 client (for example [Hyperledger Besu]), or access a
+* If running validators, install any execution client (for example [Hyperledger Besu]), or access a
     cloud-based service such as [Infura].
 
 Teku allows you run a [beacon chain client only], or you can [run the beacon chain client
 with validators] on a public testnet.
 
 ## Run validators on a testnet
 
-Ethereum 2.0 validators need to access an Ethereum 1.0 client to onboard new validators.
-Validators make deposits into Ethereum 1.0, and existing Ethereum 2.0 validators must
-process the deposits to allow the validators to join Ethereum 2.0.
+Consensus layer validators need to access an execution client to onboard new validators.
+New validators make deposits on the execution layer testnet, and existing consensus layer validators
+must process the deposits to allow the validators to join.
 
-Deposits are made into a deposit contract on the Goerli Ethereum 1.0 testnet.
+Deposits are made into a deposit contract on the Goerli execution layer testnet.
 
-The steps to run an Ethereum 2.0 validator on a testnet are:
+The steps to run a consensus layer validator on a testnet are:
 
-1. If using a local Ethereum 1.0 client, [sync the Ethereum 1.0 network containing
-    the deposit contract](#sync-the-ethereum-10-network).
+1. If using a local execution client, [sync the execution layer network containing
+    the deposit contract](#sync-the-execution-layer-network).
 
     !!! note
-        This step is only required if using a local Ethereum 1.0 client such as Besu.
+        This step is only required if using a local execution client such as Besu.
         If using a cloud-based service such as Infura, proceed to
         [fund your deposit account](#load-the-deposit-account-with-eth).
 
-1. [Fund the Ethereum 1.0 deposit account](#load-the-deposit-account-with-eth).
+1. [Fund the execution layer deposit account](#load-the-deposit-account-with-eth).
 
 1. [Generate the validator keys and send the deposit to the deposit
     contract](#generate-the-validators-and-send-the-deposits).
@@ -52,11 +57,11 @@ The steps to run an Ethereum 2.0 validator on a testnet are:
 
 1. [Start Teku with the validator keys](#start-the-validator).
 
-### Sync the Ethereum 1.0 network
+### Sync the execution layer network
 
-This step is only required if using a local Ethereum 1.0 client.
+This step is only required if running your own execution client.
 
-This example uses Besu to connect to Ethereum 1.0, but any client can be used.
+This example uses Besu as an execution client, but any client can be used.
 Configure Besu to [connect to Goerli] and expose the RPC-HTTP APIs.
 
 !!! example
@@ -68,7 +73,7 @@ Configure Besu to [connect to Goerli] and expose the RPC-HTTP APIs.
 
 ### Load the deposit account with ETH
 
-You need an Ethereum 1.0 Goerli testnet account that contains the amount of
+You need an execution layer Goerli testnet account that contains the amount of
 Goerli ETH (plus gas) required to activate the validator. The `prater` testnet
 requires 32 Goerli ETH per validator.
 

docs/HowTo/Get-Started/Installation-Options/Run-Docker-Image.md

@@ -25,7 +25,7 @@ docker image instead of the command line options.
 !!! Example "Example using Environment variables and CLI options"
 
     ```bash
-    docker run -d -p 9000:9000 -p 5051:5051 -e TEKU_REST_API_ENABLED=true -e TEKU_P2P_PORT=9000 --mount type=bind,source=/Users/user1/teku/,target=/var/lib/teku consensys/teku:latest --network=prater --eth1-endpoint=http://102.10.10.1:8545 --validator-keys=/var/lib/teku/validator/keys:/var/lib/teku/validator/passwords --data-path=/var/lib/teku --log-destination=CONSOLE
+    docker run -d -p 9000:9000/tcp -p 9000:9000/udp -p 5051:5051 -e TEKU_REST_API_ENABLED=true -e TEKU_P2P_PORT=9000 --mount type=bind,source=/Users/user1/teku/,target=/var/lib/teku consensys/teku:latest --network=prater --eth1-endpoint=http://102.10.10.1:8545 --validator-keys=/var/lib/teku/validator/keys:/var/lib/teku/validator/passwords --data-path=/var/lib/teku --log-destination=CONSOLE
     ```
 
 !!! tips
@@ -49,7 +49,7 @@ docker container.
 !!! example
 
     ```bash
-    docker run -p 9000:9000 --user 1001:1001 --mount type=bind,source=/Users/user1/teku/,target=/var/lib/teku consensys/teku:latest --data-base-path=/var/lib/teku --network=prater --eth1-endpoint=http://102.10.10.1:8545 --validator-keys=/var/lib/teku/validator/keys:/var/lib/teku/validator/passwords
+    docker run -p 9000:9000/tcp -p 9000:9000/udp --user 1001:1001 --mount type=bind,source=/Users/user1/teku/,target=/var/lib/teku consensys/teku:latest --data-base-path=/var/lib/teku --network=prater --eth1-endpoint=http://102.10.10.1:8545 --validator-keys=/var/lib/teku/validator/keys:/var/lib/teku/validator/passwords
     ```
 
 ## Exposing ports
@@ -65,13 +65,13 @@ specified using:
 To run Teku exposing local ports for access:
 
 ```bash
-docker run -p <localportP2P>:30303 -p <localportREST>:5051 consensys/teku:latest --network=<NETWORK> --data-base-path=<DATA_DIR> --eth1-endpoint=<URL> --validator-keys=<KEY_DIR>:<PASS_DIR> --rest-api-enabled=true
+docker run -p <localportP2P>:30303/tcp -p <localportP2P>:30303/udp -p <localportREST>:5051 consensys/teku:latest --network=<NETWORK> --data-base-path=<DATA_DIR> --eth1-endpoint=<URL> --validator-keys=<KEY_DIR>:<PASS_DIR> --rest-api-enabled=true
 ```
 
 !!! example
 
     ```
-    docker run -p 30303:30303 -p 5051:5051 --mount type=bind,source=/Users/user1/teku/,target=/var/lib/teku consensys/teku:latest --network=prater --data-base-path=/var/lib/teku --eth1-endpoint=http://102.10.10.1:8545 --validator-keys=/var/lib/teku/validator/keys:/var/lib/teku/validator/passwords --rest-api-enabled=true
+    docker run -p 30303:30303/tcp -p 30303:30303/udp -p 5051:5051 --mount type=bind,source=/Users/user1/teku/,target=/var/lib/teku consensys/teku:latest --network=prater --data-base-path=/var/lib/teku --eth1-endpoint=http://102.10.10.1:8545 --validator-keys=/var/lib/teku/validator/keys:/var/lib/teku/validator/passwords --rest-api-enabled=true
     ```
 
 ## Run Teku using Docker Compose
@@ -84,8 +84,8 @@ The following `docker-compose.yml` file starts a [Hyperledger Besu] and Teku nod
 
 !!! note
 
-    The example assumes the validators specified in [`--validator-keys`](../../../Reference/CLI/CLI-Syntax.md#validator-keys) has already
-    been registered in the Ethereum 1.0 deposit contract.
+    The example assumes the validators specified in [`--validator-keys`](../../../Reference/CLI/CLI-Syntax.md#validator-keys) have already
+    been registered in the deposit contract.
 
 Run `docker-compose up` in the directory containing the `docker-compose.yml` file
 to start the container.
@@ -111,7 +111,8 @@ to start the container.
         ports:
           # Map the p2p port(30303) and RPC HTTP port(8545)
           - "8545:8545"
-          - "30303:30303"
+          - "30303:30303/tcp"
+          - "30303:30303/udp"
 
       teku_node:
         environment:
@@ -130,7 +131,8 @@ to start the container.
           - ./teku:/opt/teku/data
         ports:
           # Map the p2p port(9000) and REST API port(5051)
-          - "9000:9000"
+          - "9000:9000/tcp"
+          - "9000:9000/udp"
           - "5051:5051"
     ```
 
@@ -153,7 +155,8 @@ to start the container.
         ports:
           # Map the p2p port(30303) and RPC HTTP port(8545)
           - "8545:8545"
-          - "30303:30303"
+          - "30303:30303/tcp"
+          - "30303:30303/udp"
 
       teku_node:
         environment:
@@ -171,7 +174,8 @@ to start the container.
           - ./teku:/opt/teku/data
         ports:
           # Map the p2p port(9000) and REST API port(5051)
-          - "9000:9000"
+          - "9000:9000/tcp"
+          - "9000:9000/udp"
           - "5051:5051"
     ```
 

docs/HowTo/Monitor/Metrics.md

@@ -93,7 +93,7 @@ To configure Prometheus and run with Teku:
         The available metrics are prefixed with the category type specified using
         [`--metrics-categories`](../../Reference/CLI/CLI-Syntax.md#metrics-categories).
 
-        The [Ethereum 2.0 specification] lists the minimum set of metrics implemented by
+        The [beacon chain metrics] lists the minimum set of metrics implemented by
         beacon chain clients.
 
 Click the **Graph** tab to view the data as a time-based graph. The query string displays below
@@ -106,5 +106,5 @@ Use
 [Teku Grafana dashboard](https://grafana.com/grafana/dashboards/13457).
 
 <!-- Links -->
-[Ethereum 2.0 specification]: https://github.com/ethereum/eth2.0-metrics/blob/master/metrics.md
+[beacon chain metrics]: https://github.com/ethereum/beacon-metrics/blob/master/metrics.md
 [Grafana]: https://grafana.com/docs/grafana/latest/guides/getting_started/

docs/HowTo/Voluntary-Exit.md

@@ -21,7 +21,7 @@ exited to avoid penalties.
 !!! danger
 
     Even if a validator has successfully exited, it cannot withdraw its funds until withdrawals are
-    enabled in a future phase of the Ethereum 2.0 network.
+    enabled in a future upgrade of the consensus layer.
 
 ## Initiate a voluntary exit
 

docs/Reference/CLI/CLI-Syntax.md

@@ -288,7 +288,7 @@ is specified using [`--data-base-path`](#data-base-path-data-path).
     eth1-deposit-contract-address: "0x77f7bED277449F51505a4C54550B074030d989bC"
     ```
 
-Ethereum 1.0 address of the deposit contract. Only required when creating a custom network.
+The address of the deposit contract. Only required when creating a custom network.
 
 The deposit contract address can also be defined in:
 
@@ -353,7 +353,7 @@ receiving warnings that the ETH1 node is unavailable.
     eth1-endpoint: ["http://localhost:8545","https://mainnet.infura.io/v3/d0e21ccd0b1e4eef7784422eabc51111"]
     ```
 
-Comma-separated list of JSON-RPC URLs of Ethereum 1.0 nodes. Each time Teku makes a call, it finds
+Comma-separated list of JSON-RPC URLs of execution layer (Ethereum 1.0) nodes. Each time Teku makes a call, it finds
 the first provider in the list that is available, on the right chain, and in sync. This option must
 be specified if running a validator.
 
@@ -824,20 +824,20 @@ The default is `8008`.
 
 Predefined network configuration.
 Accepts a predefined network name, or file path or URL to a YAML configuration file. See the
-[Ethereum 2.0 specification] for examples.
+[consensus specification] for examples.
 
 The default is `mainnet`.
 
 Possible values are:
 
-| Network   | Chain   | Type       | Description                                      |
-|:----------|:--------|:-----------|:-------------------------------------------------|
-| `mainnet` | Eth 2.0 | Production | Main network.                                    |
-| `minimal` | Eth 2.0 | Test       | Used for local testing and development networks. |
-| `prater`  | Eth 2.0 | Test       | Multi-client testnet.                            |
+| Network   | Chain           | Type       | Description                                      |
+|:----------|:----------------|:-----------|:-------------------------------------------------|
+| `mainnet` | Consensus layer | Production | Main network.                                    |
+| `minimal` | Consensus layer | Test       | Used for local testing and development networks. |
+| `prater`  | Consensus layer | Test       | Multi-client testnet.                            |
 
 Predefined networks can provide defaults such as the initial state of the network,
-bootnodes, and the address of the Ethereum 1.0 deposit contract.
+bootnodes, and the address of the deposit contract.
 
 ### p2p-advertised-ip
 
@@ -2003,16 +2003,10 @@ When `LOGGING` is enabled, attestation and block performance is reported as log
     ws-checkpoint: "0x5a642bb8f367e98c0d11426d98d28c465f8988fc960500886cb49faf0372883a:3600"
     ```
 
-A recent checkpoint within the [weak subjectivity period]. Accepts the checkpoint using either
-`<blockRoot>:<epochNumber>`, where `<blockRoot>` must start with `0x`, or a URL containing the
-`<blockRoot>:<epochNumber>` in a JSON payload via the `ws_checkpoint` key.
-For example:
+A recent checkpoint within the [weak subjectivity period]. Accepts the checkpoint using
+`<blockRoot>:<epochNumber>`, where `<blockRoot>` must start with `0x`.
 
-```bash
---ws-checkpoint=https://beaconscan.com/ws_checkpoint
-```
-
-The weak subjectivity checkpoint is a recent finalized checkpoint on the correct chain. By
+The weak subjectivity checkpoint is a recent, finalized checkpoint on the correct chain. By
 supplying a weak subjectivity checkpoint, you ensure that nodes that have been offline for a long
 period follow the correct chain. It protects the node from long-range attacks by malicious actors.
 
@@ -2027,5 +2021,5 @@ or clear your weak subjectivity settings.
 [weak subjectivity period]: ../../Concepts/Weak-Subjectivity.md
 [load new validators without restarting Teku]: ../../HowTo/Load-Validators-No-Restart.md
 [recent finalized checkpoint state from which to sync]: ../../HowTo/Get-Started/Checkpoint-Start.md
-[Ethereum 2.0 specification]: https://github.com/ethereum/eth2.0-specs/tree/master/configs
+[consensus specification]: https://github.com/ethereum/consensus-specs/tree/master/configs
 [metrics]: ../../HowTo/Monitor/Metrics.md