zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wallet: Store internal transparent keys in the keypool 

Now that the keypool is not used by any consumers of external
transparent keys, we switch it to only contain internal keys. To handle
the impedance mismatch, we clear out the keypool when a mnemonic seed is
generated for the wallet.
This commit is contained in:
Jack Grigg 2022-02-10 19:36:18 +00:00
parent 11e62fa997
commit 2555aadf31
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wallet/wallet.cpp
View File

@ -2279,7 +2279,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
Lock(); Lock();
Unlock(strWalletPassphrase); Unlock(strWalletPassphrase);
NewKeyPool(); // TODO: migrate to a new mnemonic when encrypting an unencrypted wallet?
Lock(); Lock();
// Need to completely rewrite the wallet file; if we don't, bdb might keep // Need to completely rewrite the wallet file; if we don't, bdb might keep
@ -3122,6 +3122,11 @@ void CWallet::GenerateNewSeed(Language language)
// as a hdchain object // as a hdchain object
CHDChain newHdChain(seed.Fingerprint(), nCreationTime); CHDChain newHdChain(seed.Fingerprint(), nCreationTime);
SetMnemonicHDChain(newHdChain, false); SetMnemonicHDChain(newHdChain, false);
// Now that we can derive keys deterministically, clear out the legacy
// transparent keypool of all randomly-generated keys, and fill it with
// internal keys (for use as change addresses or miner outputs).
NewKeyPool();
} }
bool CWallet::SetMnemonicSeed(const MnemonicSeed& seed) bool CWallet::SetMnemonicSeed(const MnemonicSeed& seed)
@ -5024,8 +5029,9 @@ bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
} }
/** /**
* Mark old keypool keys as used, * Mark old keypool keys as used, and derive new internal keys.
* and generate all new keys *
* This is only used when first migrating to HD-derived transparent keys.
*/ */
bool CWallet::NewKeyPool() bool CWallet::NewKeyPool()
{ {
@ -5043,7 +5049,7 @@ bool CWallet::NewKeyPool()
for (int i = 0; i < nKeys; i++) for (int i = 0; i < nKeys; i++)
{ {
int64_t nIndex = i+1; int64_t nIndex = i+1;
walletdb.WritePool(nIndex, CKeyPool(GenerateNewKey(true))); walletdb.WritePool(nIndex, CKeyPool(GenerateNewKey(false)));
setKeyPool.insert(nIndex); setKeyPool.insert(nIndex);
} }
LogPrintf("CWallet::NewKeyPool wrote %d new keys\n", nKeys); LogPrintf("CWallet::NewKeyPool wrote %d new keys\n", nKeys);
@ -5073,7 +5079,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
int64_t nEnd = 1; int64_t nEnd = 1;
if (!setKeyPool.empty()) if (!setKeyPool.empty())
nEnd = *(--setKeyPool.end()) + 1; nEnd = *(--setKeyPool.end()) + 1;
if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey(true)))) if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey(false))))
throw runtime_error("TopUpKeyPool(): writing generated key failed"); throw runtime_error("TopUpKeyPool(): writing generated key failed");
setKeyPool.insert(nEnd); setKeyPool.insert(nEnd);
LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size()); LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size());

2
src/wallet/wallet.h
View File

@ -1531,7 +1531,9 @@ public:
*/ */
static CAmount GetRequiredFee(unsigned int nTxBytes); static CAmount GetRequiredFee(unsigned int nTxBytes);
private:
bool NewKeyPool(); bool NewKeyPool();
public:
bool TopUpKeyPool(unsigned int kpSize = 0); bool TopUpKeyPool(unsigned int kpSize = 0);
void ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool); void ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool);
void KeepKey(int64_t nIndex); void KeepKey(int64_t nIndex);