Merge branch 'master' of https://github.com/zcash/zcash into dev

2018-10-08 17:19:15 -07:00
parent 8682e17a7d
commit c2dc091e40
13 changed files with 570 additions and 48 deletions
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -157,7 +157,7 @@ bool CBasicKeyStore::AddSaplingFullViewingKey(
    auto ivk = fvk.in_viewing_key();
    mapSaplingFullViewingKeys[ivk] = fvk;

-    return AddSaplingIncomingViewingKey(ivk, defaultAddr);
+    return CBasicKeyStore::AddSaplingIncomingViewingKey(ivk, defaultAddr);
 }

 // This function updates the wallet's internal address->ivk map.