Change default_address to return SaplingPaymentAddr and not boost::optional

src/keystore.cpp

@@ -98,16 +98,17 @@ bool CBasicKeyStore::AddSaplingSpendingKey(const libzcash::SaplingSpendingKey &s
 {
     LOCK(cs_SpendingKeyStore);
     auto fvk = sk.full_viewing_key();
-    mapSaplingSpendingKeys[fvk] = sk;
     
     // if SaplingFullViewingKey is not in SaplingFullViewingKeyMap, add it
-    AddSaplingFullViewingKey(fvk);
+    if (!AddSaplingFullViewingKey(fvk)){
+        return false;
+    }
     
+    mapSaplingSpendingKeys[fvk] = sk;
+
     // Add addr -> SaplingIncomingViewing to SaplingIncomingViewingKeyMap
     auto ivk = fvk.in_viewing_key();
-    auto addrOpt = sk.default_address();
-    assert(addrOpt != boost::none);
-    auto addr = addrOpt.value();
+    auto addr = sk.default_address();
     mapSaplingIncomingViewingKeys[addr] = ivk;
     
     return true;