From 3126e56dcd058eec49f4a4c76e9a34e9319b16ab Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Mon, 20 Jun 2022 22:49:55 -0400 Subject: [PATCH] [DOCS]: add note about hardcoded ropsten ttd As per #25018 (included in v1.10.19), the new Ropsten TTD is hardcoded, and users no longer have to use the --override.terminaltotaldifficulty flag. --- docs/_interface/merge.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_interface/merge.md b/docs/_interface/merge.md index e71015bd2842..8a204259e67b 100644 --- a/docs/_interface/merge.md +++ b/docs/_interface/merge.md @@ -33,7 +33,7 @@ In advance of the Mainnet merge, several public testnets will transition from Po The first public testnet to merge will be Ropsten. As the Ropsten merge approaches, Geth users will need to prepare to ensure a smooth transition. -{% include note.html content="The merge event did not go smoothly on Ropsten. Use `--override.terminaltotaldifficulty 50000000000000000` when launching Geth for Ropsten." %} +{% include note.html content="The merge event did not go smoothly on Ropsten. However, if you are running Geth v1.10.19 or later, no action is required. If you are running Geth v1.10.18 or earlier, you should use `--override.terminaltotaldifficulty 50000000000000000` when launching Geth for Ropsten." %} ### Consensus client