diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-28 09:18:20 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-28 09:18:20 +0200 |
| commit | 4115af7ac78971617c4fb80b7db336ff6bf254db (patch) | |
| tree | dd48e792fae1466201f15bea038bb720437a6a1e /src | |
| parent | 9382f0425e87b30e4621e0e23a99d6e880ec2200 (diff) | |
| download | bitcoin-4115af7ac78971617c4fb80b7db336ff6bf254db.tar.xz | |
Fix rebase issue where pwalletMain was used instead of pwallet
Ser./Deser. nInternalChainCounter as last element
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 | ||||
| -rw-r--r-- | 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 c715da8e9f..22b1e3522c 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 016296f259..271c1d66c9 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() |