Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-13 19:50:43 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix rebase issue where pwalletMain was used instead of pwallet

Browse Source 
Ser./Deser. nInternalChainCounter as last element
This commit is contained in:
Jonas Schnelli 2017-03-28 09:18:20 +02:00
parent 9382f0425e
commit 4115af7ac7
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/rpcwallet.cpp
View File

@ -2439,7 +2439,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
UniValue obj(UniValue::VOBJ); 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("walletversion", pwallet->GetVersion()));
obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance()))); obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance())));
obj.push_back(Pair("unconfirmed_balance", ValueFromAmount(pwallet->GetUnconfirmedBalance()))); obj.push_back(Pair("unconfirmed_balance", ValueFromAmount(pwallet->GetUnconfirmedBalance())));

2
src/wallet/walletdb.h
View File

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