slackcoder/bitcoin - Bitcoin Code integration/staging tree

Age	Commit message (Collapse)	Author
2016-12-05	remove internal tracking of mempool conflicts for reporting to wallet	Alex Morcos

2016-11-19	Introduce convenience type CTransactionRef	Pieter Wuille

2016-11-19	Make CBlock::vtx a vector of shared_ptr<CTransaction>	Pieter Wuille

2016-11-07	Get rid of nType and nVersion	Pieter Wuille
	Remove the nType and nVersion as parameters to all serialization methods and functions. There is only one place where it's read and has an impact (in CAddress), and even there it does not impact any of the recursively invoked serializers. Instead, the few places that need nType or nVersion are changed to read it directly from the stream object, through GetType() and GetVersion() methods which are added to all stream classes.
2016-10-21	Return shared_ptr<CTransaction> from mempool removes	Pieter Wuille

2016-10-21	Make removed and conflicted arguments optional to remove	Pieter Wuille

2016-10-04	Use cmpctblock type 2 for segwit-enabled transfer	Pieter Wuille
	Contains version negotiation logic by Matt Corallo and bugfixes by Suhas Daftuar.
2016-08-05	Remove redundand (and shadowing) declaration	Pavel Janík

2016-06-19	Add some blockencodings tests	Matt Corallo