From 4115af7ac78971617c4fb80b7db336ff6bf254db Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Tue, 28 Mar 2017 09:18:20 +0200
Subject: [PATCH] Fix rebase issue where pwalletMain was used instead of
 pwallet Ser./Deser. nInternalChainCounter as last element

---
 src/wallet/rpcwallet.cpp | 2 +-
 src/wallet/walletdb.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c715da8e9..22b1e3522 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2439,7 +2439,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
 
     UniValue obj(UniValue::VOBJ);
 
-    size_t kpExternalSize = pwalletMain->KeypoolCountExternalKeys();
+    size_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
     obj.push_back(Pair("walletversion", pwallet->GetVersion()));
     obj.push_back(Pair("balance",       ValueFromAmount(pwallet->GetBalance())));
     obj.push_back(Pair("unconfirmed_balance", ValueFromAmount(pwallet->GetUnconfirmedBalance())));
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 016296f25..271c1d66c 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -61,9 +61,9 @@ public:
     {
         READWRITE(this->nVersion);
         READWRITE(nExternalChainCounter);
+        READWRITE(masterKeyID);
         if (this->nVersion >= VERSION_HD_CHAIN_SPLIT)
             READWRITE(nInternalChainCounter);
-        READWRITE(masterKeyID);
     }
 
     void SetNull()