Fix first run initialization of zwallet with encrypted wallet.dat file

Fuzzbawls · Fuzzbawls · commit 8bd49be8b91c · 2018-04-26T00:23:38.000-07:00
When running the client with a `wallet.dat` file that has never
initialized it's zwallet or dzPIV, there is an incorrect code pathway
that leads to the dzPIV seed hash never being written to the wallet
file. Instead, we copy the seed generation code into `crypter.cpp` which
will allow for proper dzPIV seed generation upon first unlock.
diff --git a/src/crypter.cpp b/src/crypter.cpp
@@ -261,6 +261,15 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
                 return error("Failed to read zPIV seed from DB. Wallet is probably corrupt.");
             }
             pwalletMain->zwalletMain->SetMasterSeed(nSeed, false);
+        } else {
+            // First time this wallet has been unlocked with dzPIV
+            // Borrow random generator from the key class so that we don't have to worry about randomness
+            CKey key;
+            key.MakeNewKey(true);
+            uint256 seed = key.GetPrivKey_256();
+            LogPrintf("%s: first run of zpiv wallet detected, new seed generated. Seedhash=%s\n", __func__, Hash(seed.begin(), seed.end()).GetHex());
+            pwalletMain->zwalletMain->SetMasterSeed(seed, true);
+            pwalletMain->zwalletMain->GenerateMintPool();
         }
     }
 
diff --git a/src/zpivwallet.cpp b/src/zpivwallet.cpp
@@ -39,7 +39,7 @@ CzPIVWallet::CzPIVWallet(std::string strWalletFile)
     }
 
     //Don't try to do anything if the wallet is locked.
-    if (pwalletMain->IsLocked() && !fFirstRun) {
+    if (pwalletMain->IsLocked()) {
         seedMaster = 0;
         nCountLastUsed = 0;
         this->mintPool = CMintPool();

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,15 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)`
`261`	`261`	`return error("Failed to read zPIV seed from DB. Wallet is probably corrupt.");`
`262`	`262`	`}`
`263`	`263`	`pwalletMain->zwalletMain->SetMasterSeed(nSeed, false);`
	`264`	`+ } else {`
	`265`	`+ // First time this wallet has been unlocked with dzPIV`
	`266`	`+ // Borrow random generator from the key class so that we don't have to worry about randomness`
	`267`	`+ CKey key;`
	`268`	`+ key.MakeNewKey(true);`
	`269`	`+ uint256 seed = key.GetPrivKey_256();`
	`270`	`+ LogPrintf("%s: first run of zpiv wallet detected, new seed generated. Seedhash=%s\n", __func__, Hash(seed.begin(), seed.end()).GetHex());`
	`271`	`+ pwalletMain->zwalletMain->SetMasterSeed(seed, true);`
	`272`	`+ pwalletMain->zwalletMain->GenerateMintPool();`
`264`	`273`	`}`
`265`	`274`	`}`
`266`	`275`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ CzPIVWallet::CzPIVWallet(std::string strWalletFile)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`//Don't try to do anything if the wallet is locked.`
`42`		`- if (pwalletMain->IsLocked() && !fFirstRun) {`
	`42`	`+ if (pwalletMain->IsLocked()) {`
`43`	`43`	`seedMaster = 0;`
`44`	`44`	`nCountLastUsed = 0;`
`45`	`45`	`this->mintPool = CMintPool();`