Commit Graph

8 Commits

Author SHA1 Message Date
JoelKatz
e89af2f784 Merge branch 'continuousClose'
Conflicts:
	src/LedgerAcquire.cpp
	src/NetworkOPs.h

Merge continuous ledger close into main branch. YAY!
2012-07-16 14:48:21 -07:00
JoelKatz
c82bd2805b Merge branch 'master' of github.com:jedmccaleb/NewCoin into continuousClose
Conflicts:
	src/Ledger.h
	src/LedgerNode.cpp
	src/Version.h
2012-07-10 10:31:13 -07:00
Arthur Britto
9e04ae76fc Change protocol version. 2012-07-07 17:59:21 -07:00
JoelKatz
3a77ef5c82 Begin implementing continuous ledger close.
Pretty much all remaining changes should be to LedgerConsensus.cpp
2012-06-29 16:34:16 -07:00
JoelKatz
d042a1f49d Rework version logic as agreed. 2012-06-25 15:20:22 -07:00
JoelKatz
93ad67c240 Close SHAMap node security hole
Use new hash prefixes.
Use new wire/prefix formats.
Remove SHAMapException
2012-06-25 09:13:18 -07:00
JoelKatz
808cec521e It's crap like that that makes me dislike C++ sometimes. 2012-06-24 16:46:45 -07:00
JoelKatz
6018cba00e Track server and protocol version. 2012-06-24 16:29:52 -07:00