amalraj.manigmail.com
|
72270b10c7
|
Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12
# Conflicts:
# .travis.yml
# README.md
# cmd/geth/genesis_test.go
# core/genesis.go
# core/genesis_test.go
# core/state_processor.go
# eth/config.go
# eth/downloader/downloader_test.go
# eth/protocol_test.go
# params/config.go
|
2018-09-27 18:55:55 +08:00 |
Sai V
|
8a25cada96
|
EIP 155 Activation (#502)
Add ChainId validation, add a default networkId and reject network ID 1 for Quorum.
|
2018-08-23 14:51:13 -04:00 |
Peter Fox
|
71e5e86ce0
|
Update files to keep in line with vanilla geth, adding back in the
pieces needed for Quorum.
|
2018-07-15 19:45:45 +01:00 |
Peter Fox
|
cdede06771
|
Let constellation have longer to start up
Add more gas for test
Set Quorum to be true
Update expected block hash in test
|
2018-07-13 11:33:52 +01:00 |
Qvintvs
|
4b44bea1d7
|
Merge attempt
|
2018-05-31 14:16:44 +08:00 |
Patrick Mylund Nielsen
|
3d91976f08
|
Geth 1.7.2 rebase and addition of Istanbul BFT (#207)
|
2017-10-31 18:24:11 -04:00 |