fixup! Use importmulti timestamp when importing watch only keys

ryanofsky · ryanofsky · commit 777b3db229e1 · 2017-01-23T14:11:59.000-05:00
Index key metadata map by CTxDestination instead of uint160

Suggested by Alex Morcos &lt;morcos@chaincode.com&gt;. This is more type safe and
avoids potential collisions.
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -575,15 +575,17 @@ UniValue dumpwallet(const JSONRPCRequest& request)
     if (!file.is_open())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
 
-    std::map<CKeyID, int64_t> mapKeyBirth;
+    std::map<CTxDestination, int64_t> mapKeyBirth;
     std::set<CKeyID> setKeyPool;
     pwalletMain->GetKeyBirthTimes(mapKeyBirth);
     pwalletMain->GetAllReserveKeys(setKeyPool);
 
     // sort time/key pairs
     std::vector<std::pair<int64_t, CKeyID> > vKeyBirth;
-    for (std::map<CKeyID, int64_t>::const_iterator it = mapKeyBirth.begin(); it != mapKeyBirth.end(); it++) {
-        vKeyBirth.push_back(std::make_pair(it->second, it->first));
+    for (auto it = mapKeyBirth.begin(); it != mapKeyBirth.end(); it++) {
+        if (const CKeyID* keyID = boost::get<CKeyID>(&it->first)) {
+            vKeyBirth.push_back(std::make_pair(it->second, *keyID));
+        }
     }
     mapKeyBirth.clear();
     std::sort(vKeyBirth.begin(), vKeyBirth.end());
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -206,11 +206,11 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey,
     return false;
 }
 
-bool CWallet::LoadKeyMetadata(uint160 id, const CKeyMetadata &meta)
+bool CWallet::LoadKeyMetadata(const CTxDestination& keyID, const CKeyMetadata &meta)
 {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
     UpdateTimeFirstKey(meta.nCreateTime);
-    mapKeyMetadata[id] = meta;
+    mapKeyMetadata[keyID] = meta;
     return true;
 }
 
@@ -3257,12 +3257,12 @@ class CAffectedKeysVisitor : public boost::static_visitor<void> {
     void operator()(const CNoDestination &none) {}
 };
 
-void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
+void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) const {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
     mapKeyBirth.clear();
 
     // get birth times for keys with metadata
-    for (std::map<uint160, CKeyMetadata>::const_iterator it = mapKeyMetadata.begin(); it != mapKeyMetadata.end(); it++)
+    for (auto it = mapKeyMetadata.begin(); it != mapKeyMetadata.end(); it++)
         if (it->second.nCreateTime)
             mapKeyBirth[it->first] = it->second.nCreateTime;
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -616,7 +616,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     // Map from Key ID (for regular keys) or Script ID (for watch-only keys) to
     // key metadata.
-    std::map<uint160, CKeyMetadata> mapKeyMetadata;
+    std::map<CTxDestination, CKeyMetadata> mapKeyMetadata;
 
     typedef std::map<unsigned int, CMasterKey> MasterKeyMap;
     MasterKeyMap mapMasterKeys;
@@ -708,7 +708,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     //! Adds a key to the store, without saving it to disk (used by LoadWallet)
     bool LoadKey(const CKey& key, const CPubKey &pubkey) { return CCryptoKeyStore::AddKeyPubKey(key, pubkey); }
     //! Load metadata (used by LoadWallet)
-    bool LoadKeyMetadata(uint160 id, const CKeyMetadata &metadata);
+    bool LoadKeyMetadata(const CTxDestination& pubKey, const CKeyMetadata &metadata);
 
     bool LoadMinVersion(int nVersion) { AssertLockHeld(cs_wallet); nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; }
     void UpdateTimeFirstKey(int nCreateTime);
@@ -740,7 +740,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase);
     bool EncryptWallet(const SecureString& strWalletPassphrase);
 
-    void GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const;
+    void GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) const;
 
     /** 
      * Increment the next transaction order id
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -459,25 +459,25 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         }
         else if (strType == "keymeta" || strType == "watchmeta")
         {
-            uint160 keyId;
+            CTxDestination keyID;
             if (strType == "keymeta")
             {
               CPubKey vchPubKey;
               ssKey >> vchPubKey;
-              keyId = vchPubKey.GetID();
+              keyID = vchPubKey.GetID();
             }
             else if (strType == "watchmeta")
             {
               CScript script;
               ssKey >> *(CScriptBase*)(&script);
-              keyId = CScriptID(script);
+              keyID = CScriptID(script);
             }
 
             CKeyMetadata keyMeta;
             ssValue >> keyMeta;
             wss.nKeyMeta++;
 
-            pwallet->LoadKeyMetadata(keyId, keyMeta);
+            pwallet->LoadKeyMetadata(keyID, keyMeta);
         }
         else if (strType == "defaultkey")
         {

Original file line number	Diff line number	Diff line change
`@@ -459,25 +459,25 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`459`	`459`	`}`
`460`	`460`	`else if (strType == "keymeta" \|\| strType == "watchmeta")`
`461`	`461`	`{`
`462`		`- uint160 keyId;`
	`462`	`+ CTxDestination keyID;`
`463`	`463`	`if (strType == "keymeta")`
`464`	`464`	`{`
`465`	`465`	`CPubKey vchPubKey;`
`466`	`466`	`ssKey >> vchPubKey;`
`467`		`- keyId = vchPubKey.GetID();`
	`467`	`+ keyID = vchPubKey.GetID();`
`468`	`468`	`}`
`469`	`469`	`else if (strType == "watchmeta")`
`470`	`470`	`{`
`471`	`471`	`CScript script;`
`472`	`472`	`ssKey >> (CScriptBase)(&script);`
`473`		`- keyId = CScriptID(script);`
	`473`	`+ keyID = CScriptID(script);`
`474`	`474`	`}`
`475`	`475`
`476`	`476`	`CKeyMetadata keyMeta;`
`477`	`477`	`ssValue >> keyMeta;`
`478`	`478`	`wss.nKeyMeta++;`
`479`	`479`
`480`		`- pwallet->LoadKeyMetadata(keyId, keyMeta);`
	`480`	`+ pwallet->LoadKeyMetadata(keyID, keyMeta);`
`481`	`481`	`}`
`482`	`482`	`else if (strType == "defaultkey")`
`483`	`483`	`{`