status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge stable into unstable

This commit is contained in:
Zahary Karadjov 2021-03-22 23:13:05 +02:00
parent d1357801e7 25695d1e4f
commit 5fd82ddaf5
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -8,6 +8,12 @@ TBD
* `getChronosFutures` is now `debug_getChronosFutures` * `getChronosFutures` is now `debug_getChronosFutures`
2021-03-10 v1.0.11
==================
This is a minor release adding support for connecting to the Prater testnet.
2021-03-10 v1.0.10 2021-03-10 v1.0.10
================== ==================

2
beacon_chain/version.nim
View File

@ -9,7 +9,7 @@ when not defined(nimscript):
const const
versionMajor* = 1 versionMajor* = 1
versionMinor* = 0 versionMinor* = 0
versionBuild* = 10 versionBuild* = 11
versionBlob* = "stateofus" # Single word - ends up in the default graffitti versionBlob* = "stateofus" # Single word - ends up in the default graffitti

10
docker/dist/README.md vendored
View File

@ -67,3 +67,13 @@ All the same conventions apply:
WEB3_URL="ws://localhost:8545" ./run-mainnet-node.sh --max-peers=150 WEB3_URL="ws://localhost:8545" ./run-mainnet-node.sh --max-peers=150
``` ```
## Running a Prater node
`run-prater-beacon-node.sh` is a similar script intended for connecting to the Prater
testnet. All the same conventions apply:
```bash
# using a local Geth instance
WEB3_URL="ws://localhost:8545" ./run-prater-node.sh --max-peers=150
```

2
vendor/eth2-testnets vendored

@ -1 +1 @@
Subproject commit 192c1b48ea5ff4adb4e6ef7d2a9e5f82fb5ffd72 Subproject commit 463d414cd7d2de6c7985a1ab38f932b02e390187