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-24 03:24:20 +02:00
parent adcae8d416 8391d3f83e
commit a727fc8e52
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -8,6 +8,13 @@ TBD
* `getChronosFutures` is now `debug_getChronosFutures` * `getChronosFutures` is now `debug_getChronosFutures`
2021-03-10 v1.0.12
==================
This is bugfix release correcting an error in the Prater testnet config
leading to incorrect Eth1 voting.
2021-03-10 v1.0.11 2021-03-10 v1.0.11
================== ==================

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* = 11 versionBuild* = 12
versionBlob* = "stateofus" # Single word - ends up in the default graffitti versionBlob* = "stateofus" # Single word - ends up in the default graffitti

2
vendor/eth2-testnets vendored

@ -1 +1 @@
Subproject commit 463d414cd7d2de6c7985a1ab38f932b02e390187 Subproject commit 5b4e32779b66b6d84edb13aa4eee67f544313d4b