From a68e51ffc48bd6e61fdcb88344406e09dbafc716 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Tue, 18 Aug 2015 17:56:35 -0400
Subject: [PATCH] Regtest and wallet ready event - Added a check for the wallet
 availability during onBlocksReady - Fixed a problem with spaces being added
 at the end of the file by git diff

---
 bin/build          | 5 +++--
 src/libbitcoind.cc | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/build b/bin/build
index bb3f8b8a..189c743f 100755
--- a/bin/build
+++ b/bin/build
@@ -36,8 +36,9 @@ compare_patch () {
   cd "${btc_dir}"
   get_patch_file
   echo "running the diff command from HEAD to ${tag}"
-  git diff ${tag}..HEAD > /tmp/tmp.patch
-  matching_patch=`diff -w /tmp/tmp.patch "${root_dir}/etc/bitcoin.patch"` 
+  diff=$(git diff ${tag}..HEAD)
+  stripped_diff=$( echo -n "${diff}" | head -n $( expr `echo -n "${diff}" | wc -l` - 1 ) )
+  matching_patch=`echo -n "${stripped_diff}" | diff -w "${root_dir}/etc/bitcoin.patch" -` 
 }
 
 cache_files () {
diff --git a/src/libbitcoind.cc b/src/libbitcoind.cc
index 5753eaa8..a0f8058a 100644
--- a/src/libbitcoind.cc
+++ b/src/libbitcoind.cc
@@ -471,6 +471,13 @@ async_blocks_ready(uv_work_t *req) {
     usleep(1E6);
   }
 
+  //If the wallet is enabled, then we should make sure we can load it
+#if ENABLE_WALLET
+  while(pwalletMain->LoadWallet(fFirstRun) != DB_LOAD_OK) {
+    usleep(1E6);
+  }
+#endif
+
   // Wait until we can get a lock on cs_main
   // And therefore ready to be able to quickly
   // query for transactions from the mempool.