From e1e118f9be150d4f93e0a12e8a10041a6036c832 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Tue, 3 Apr 2018 05:55:59 -0600
Subject: [PATCH] Revert "Reorder lock/transaction (#773)" write txs

This reverts commit 440f0ec90ce2eb9824a652373d46790b1e8bde54.
---
 rai/node/node.cpp   | 2 +-
 rai/node/wallet.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rai/node/node.cpp b/rai/node/node.cpp
index a5eaa566..164fe779 100644
--- a/rai/node/node.cpp
+++ b/rai/node/node.cpp
@@ -3041,8 +3041,8 @@ bool rai::election::vote (std::shared_ptr<rai::vote> vote_a)
 void rai::active_transactions::announce_votes ()
 {
 	std::vector<rai::block_hash> inactive;
-	std::lock_guard<std::mutex> lock (mutex);
 	rai::transaction transaction (node.store.environment, nullptr, true);
+	std::lock_guard<std::mutex> lock (mutex);
 
 	{
 		size_t announcements (0);
diff --git a/rai/node/wallet.cpp b/rai/node/wallet.cpp
index e0bdf47f..ce51bc6f 100644
--- a/rai/node/wallet.cpp
+++ b/rai/node/wallet.cpp
@@ -716,8 +716,8 @@ node (node_a)
 
 void rai::wallet::enter_initial_password ()
 {
-	std::lock_guard<std::recursive_mutex> lock (store.mutex);
 	rai::transaction transaction (store.environment, nullptr, true);
+	std::lock_guard<std::recursive_mutex> lock (store.mutex);
 	rai::raw_key password_l;
 	store.password.value (password_l);
 	if (password_l.data.is_zero ())