52 commits

Author	SHA1	Message	Date
Jorge Timón	60c8bac77c	Includes: Cleanup around net main and wallet ... -Move from .h to .cpp: in main, net and wallet -Remove unnecessary #include "main.h" -Cleanup some wallet files includes	2015-07-23 21:10:26 +02:00
Gavin Andresen	ad9e86dca1	Keep mempool consistent during block-reorgs ... This fixes a subtle bug involving block re-orgs and non-standard transactions. Start with a block containing a non-standard transaction, and one or more transactions spending it in the memory pool. Then re-org away from that block to another chain that does not contain the non-standard transaction. Result before this fix: the dependent transactions get stuck in the mempool without their parent, putting the mempool in an inconsistent state. Tested with a new unit test.	2015-03-26 11:58:19 -04:00