From 6cdf039c701b3027a78296437324006a505af515 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 1 Jun 2012 21:01:23 -0700
Subject: [PATCH 1/2] Back out the nonce workaround.

---
 src/SHAMap.cpp | 6 ++----
 src/SHAMap.h   | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/SHAMap.cpp b/src/SHAMap.cpp
index 1329cb81c..9188e4997 100644
--- a/src/SHAMap.cpp
+++ b/src/SHAMap.cpp
@@ -15,19 +15,17 @@
 #include "SHAMap.h"
 #include "Application.h"
 
-uint256 hash_SMN::mNonce;
-
 std::size_t hash_SMN::operator() (const SHAMapNode& mn) const
 {
 	return mn.getDepth()
 		^ *reinterpret_cast<const std::size_t *>(mn.getNodeID().begin())
-		^ *reinterpret_cast<const std::size_t *>(mNonce.begin());
+		^ *reinterpret_cast<const std::size_t *>(theApp->getNonce256().begin());
 }
 
 std::size_t hash_SMN::operator() (const uint256& u) const
 {
 	return *reinterpret_cast<const std::size_t *>(u.begin())
-		^ *reinterpret_cast<const std::size_t *>(mNonce.begin());
+		^ *reinterpret_cast<const std::size_t *>(theApp->getNonce256().begin());
 }
 
 SHAMap::SHAMap(uint32 seq) : mSeq(seq), mState(Modifying)
diff --git a/src/SHAMap.h b/src/SHAMap.h
index 09398794a..82795e979 100644
--- a/src/SHAMap.h
+++ b/src/SHAMap.h
@@ -80,10 +80,6 @@ class hash_SMN
 {
 
 public:
-	static uint256 mNonce;
-
-	static void setNonce(const uint256& nonce) { mNonce = nonce; }
-
 	std::size_t operator() (const SHAMapNode& mn) const;
 
 	std::size_t operator() (const uint256& u) const;

From 6ede1a7befef18eda2f8fc6c3872572e1ef82fdd Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sat, 2 Jun 2012 11:08:18 -0700
Subject: [PATCH 2/2] Set closed flag.

---
 src/LedgerConsensus.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index 218ee185b..bb659d721 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -669,6 +669,7 @@ void LedgerConsensus::accept(SHAMap::pointer set)
 
 	std::deque<SerializedTransaction::pointer> failedTransactions;
 	applyTransactions(set, newLCL, failedTransactions);
+	newLCL->setClosed();
 	newLCL->setAccepted();
 	newLCL->updateHash();
 	uint256 newLCLHash = newLCL->getHash();