From 1f8e1e0dcccb7d0b5e190f96e336fdd8cb374018 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 18 Jun 2012 19:10:11 -0700
Subject: [PATCH 1/4] Remove a broken assert.

---
 src/Ledger.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Ledger.cpp b/src/Ledger.cpp
index 3424fb2f64..105f251bac 100644
--- a/src/Ledger.cpp
+++ b/src/Ledger.cpp
@@ -42,7 +42,6 @@ Ledger::Ledger(const uint256 &parentHash, const uint256 &transHash, const uint25
 		mTotCoins(totCoins), mCloseTime(timeStamp), mLedgerSeq(ledgerSeq), mLedgerInterval(LEDGER_INTERVAL),
 		mClosed(false), mValidHash(false), mAccepted(false), mImmutable(false)
 {
-	assert(mParentHash.isNonZero());
 	updateHash();
 }
 

From 07d16749aef599b877e4e47d43ff8dd0fda74155 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 18 Jun 2012 19:19:21 -0700
Subject: [PATCH 2/4] Make sure we aren't validating when not in full.

---
 src/NetworkOPs.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index 60d5b226a4..958caa6e96 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -291,6 +291,12 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
 		Log(lsINFO) << "Node count (" << peerList.size() << ") is sufficient.";
 	}
 
+	if (mConsensus)
+	{
+		setStateTimer(mConsensus->timerEntry());
+		return;
+	}
+
 	// Do we have sufficient validations for our last closed ledger? Or do sufficient nodes
 	// agree? And do we have no better ledger available?
 	// If so, we are either tracking or full.
@@ -344,11 +350,6 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
 		}
 	}
 
-	if (mConsensus)
-	{
-		setStateTimer(mConsensus->timerEntry());
-		return;
-	}
 
 	if (switchLedgers)
 	{
@@ -538,6 +539,14 @@ void NetworkOPs::endConsensus()
 void NetworkOPs::setMode(OperatingMode om)
 {
 	if (mMode == om) return;
+	if (mMode == omFULL)
+	{
+		if (mConsensus)
+		{
+			mConsensus->abort();
+			mConsensus = LedgerConsensus::pointer();
+		}
+	}
 	Log l((om < mMode) ? lsWARNING : lsINFO);
 	if (om == omDISCONNECTED) l << "STATE->Disonnected";
 	else if (om == omCONNECTED) l << "STATE->Connected";

From 9bf119092ae8d8567933ef061ed77dd099597fbc Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 18 Jun 2012 19:20:10 -0700
Subject: [PATCH 3/4] Remove an extraneous debug message.

---
 src/Peer.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Peer.cpp b/src/Peer.cpp
index 6cfd008437..662e234192 100644
--- a/src/Peer.cpp
+++ b/src/Peer.cpp
@@ -632,11 +632,10 @@ void Peer::recvTransaction(newcoin::TMTransaction& packet)
 
 void Peer::recvPropose(newcoin::TMProposeSet& packet)
 {
-	Log(lsINFO) << "Received proposal from peer";
 	if ((packet.currenttxhash().size() != 32) || (packet.nodepubkey().size() < 28) ||
 		(packet.signature().size() < 56))
 	{
-		Log(lsWARNING) << "Proposal is malformed";
+		Log(lsWARNING) << "Received proposal is malformed";
 		return;
 	}
 

From 87324c828d7066aee03ba580b99efe6391dd08eb Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 18 Jun 2012 19:21:29 -0700
Subject: [PATCH 4/4] typo.

---
 src/NetworkOPs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index 958caa6e96..5c78116a51 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -544,7 +544,7 @@ void NetworkOPs::setMode(OperatingMode om)
 		if (mConsensus)
 		{
 			mConsensus->abort();
-			mConsensus = LedgerConsensus::pointer();
+			mConsensus = boost::shared_ptr<LedgerConsensus>();
 		}
 	}
 	Log l((om < mMode) ? lsWARNING : lsINFO);