interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge: fix ropsten ttd (#25052)

This commit is contained in:
Sina Mahmoodi 2022-06-09 16:45:34 +02:00 committed by GitHub
parent cd60a63ed8
commit 81604199c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/_interface/merge.md
View File

@ -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 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. 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 100000000000000000000000` when launching Geth for Ropsten." %} {% include note.html content="The merge event did not go smoothly on Ropsten. Use `--override.terminaltotaldifficulty 50000000000000000` when launching Geth for Ropsten." %}
### Consensus client ### Consensus client
@ -65,7 +65,7 @@ case for Ropsten, Geth will:
This is what it looks like by default: This is what it looks like by default:
```shell ```shell
geth --ropsten --datadir ~/.ropsten --override.terminaltotaldifficulty 100000000000000000000000 geth --ropsten --datadir ~/.ropsten --override.terminaltotaldifficulty 50000000000000000
``` ```
```terminal ```terminal
@ -88,7 +88,7 @@ openssl rand -hex 32 | tr -d "\n" > "/tmp/jwtsecret"
Now configure authentication using Geth flags: Now configure authentication using Geth flags:
```shell ```shell
geth --ropsten --datadir ~/.ropsten --authrpc.addr localhost --authrpc.port 8551 --authrpc.vhosts localhost --authrpc.jwtsecret /tmp/jwtsecret --override.terminaltotaldifficulty 100000000000000000000000 geth --ropsten --datadir ~/.ropsten --authrpc.addr localhost --authrpc.port 8551 --authrpc.vhosts localhost --authrpc.jwtsecret /tmp/jwtsecret --override.terminaltotaldifficulty 50000000000000000
``` ```
[engineapi]: https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md [engineapi]: https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md