Fix rebase issue where pwalletMain was used instead of pwallet

Ser./Deser. nInternalChainCounter as last element

Author: jonasschnelli

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())));

src/wallet/walletdb.h

@@ -61,9 +61,9 @@ class CHDChain
     {
         READWRITE(this->nVersion);
         READWRITE(nExternalChainCounter);
+        READWRITE(masterKeyID);
         if (this->nVersion >= VERSION_HD_CHAIN_SPLIT)
             READWRITE(nInternalChainCounter);
-        READWRITE(masterKeyID);
     }
 
     void SetNull()