desprout

src/rpc/misc.cpp

@@ -537,14 +537,14 @@ UniValue validateaddress(const UniValue& params, bool fHelp, const CPubKey& mypk
 {
     if (fHelp || params.size() != 1)
         throw runtime_error(
-            "validateaddress \"komodoaddress\"\n"
+            "validateaddress \"hushaddress\"\n"
-            "\nReturn information about the given Komodo address.\n"
+            "\nReturn information about the given Hush address.\n"
             "\nArguments:\n"
-            "1. \"komodoaddress\"     (string, required) The Komodo address to validate\n"
+            "1. \"hushaddress\"     (string, required) The Hush address to validate\n"
             "\nResult:\n"
             "{\n"
             "  \"isvalid\" : true|false,         (boolean) If the address is valid or not. If not, this is the only property returned.\n"
-            "  \"address\" : \"komodoaddress\",   (string) The Komodo address validated\n"
+            "  \"address\" : \"hushaddress\",   (string) The Hush address validated\n"
             "  \"scriptPubKey\" : \"hex\",       (string) The hex encoded scriptPubKey generated by the address\n"
             "  \"ismine\" : true|false,          (boolean) If the address is yours or not\n"
             "  \"isscript\" : true|false,        (boolean) If the key is a script\n"

src/test/rpc_wallet_tests.cpp

@@ -465,7 +465,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet)
     file << std::flush;
 
     // wallet should currently be empty
-    std::set<libzcash::SproutPaymentAddress> addrs;
+    std::set<libzcash::SaplingPaymentAddress> addrs;
     pwalletMain->GetSaplingPaymentAddresses(addrs);
     BOOST_CHECK(addrs.size()==0);
 
@@ -477,11 +477,13 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet)
     BOOST_CHECK(addrs.size()==1);
 
     // check that we have the spending key for the address
+    /*
     auto address = DecodePaymentAddress(testAddr);
     BOOST_CHECK(IsValidPaymentAddress(address));
     BOOST_ASSERT(boost::get<libzcash::SproutPaymentAddress>(&address) != nullptr);
     auto addr = boost::get<libzcash::SproutPaymentAddress>(address);
     BOOST_CHECK(pwalletMain->HaveSproutSpendingKey(addr));
+    */
 
     
     // Verify the spending key is the same as the test data

src/wallet/gtest/test_wallet_zkeys.cpp

@@ -106,303 +106,6 @@ TEST(wallet_zkeys_tests, StoreAndLoadSaplingZkeys) {
     EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(dpa2));
 }
 
-/**
- * This test covers methods on CWallet
- * GenerateNewSproutZKey()
- * AddSproutZKey()
- * LoadZKey()
- * LoadZKeyMetadata()
- */
-TEST(wallet_zkeys_tests, store_and_load_zkeys) {
-    SelectParams(CBaseChainParams::MAIN);
-
-    CWallet wallet;
-
-    // wallet should be empty
-    std::set<libzcash::SproutPaymentAddress> addrs;
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(0, addrs.size());
-
-    // wallet should have one key
-    auto addr = wallet.GenerateNewSproutZKey();
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(1, addrs.size());
-
-    // verify wallet has spending key for the address
-    ASSERT_TRUE(wallet.HaveSproutSpendingKey(addr));
-
-    // manually add new spending key to wallet
-    auto sk = libzcash::SproutSpendingKey::random();
-    ASSERT_TRUE(wallet.AddSproutZKey(sk));
-
-    // verify wallet did add it
-    addr = sk.address();
-    ASSERT_TRUE(wallet.HaveSproutSpendingKey(addr));
-
-    // verify spending key stored correctly
-    libzcash::SproutSpendingKey keyOut;
-    wallet.GetSproutSpendingKey(addr, keyOut);
-    ASSERT_EQ(sk, keyOut);
-
-    // verify there are two keys
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(2, addrs.size());
-    ASSERT_EQ(1, addrs.count(addr));
-
-    // Load a third key into the wallet
-    sk = libzcash::SproutSpendingKey::random();
-    ASSERT_TRUE(wallet.LoadZKey(sk));
-
-    // attach metadata to this third key
-    addr = sk.address();
-    int64_t now = GetTime();
-    CKeyMetadata meta(now);
-    ASSERT_TRUE(wallet.LoadZKeyMetadata(addr, meta));
-
-    // check metadata is the same
-    CKeyMetadata m= wallet.mapSproutZKeyMetadata[addr];
-    ASSERT_EQ(m.nCreateTime, now);
-}
-
-/**
- * This test covers methods on CWallet
- * AddSproutViewingKey()
- * RemoveSproutViewingKey()
- * LoadSproutViewingKey()
- */
-TEST(wallet_zkeys_tests, StoreAndLoadViewingKeys) {
-    SelectParams(CBaseChainParams::MAIN);
-
-    CWallet wallet;
-
-    // wallet should be empty
-    std::set<libzcash::SproutPaymentAddress> addrs;
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(0, addrs.size());
-
-    // manually add new viewing key to wallet
-    auto sk = libzcash::SproutSpendingKey::random();
-    auto vk = sk.viewing_key();
-    ASSERT_TRUE(wallet.AddSproutViewingKey(vk));
-
-    // verify wallet did add it
-    auto addr = sk.address();
-    ASSERT_TRUE(wallet.HaveSproutViewingKey(addr));
-    // and that we don't have the corresponding spending key
-    ASSERT_FALSE(wallet.HaveSproutSpendingKey(addr));
-
-    // verify viewing key stored correctly
-    libzcash::SproutViewingKey vkOut;
-    wallet.GetSproutViewingKey(addr, vkOut);
-    ASSERT_EQ(vk, vkOut);
-
-    // Load a second viewing key into the wallet
-    auto sk2 = libzcash::SproutSpendingKey::random();
-    ASSERT_TRUE(wallet.LoadSproutViewingKey(sk2.viewing_key()));
-
-    // verify wallet did add it
-    auto addr2 = sk2.address();
-    ASSERT_TRUE(wallet.HaveSproutViewingKey(addr2));
-    ASSERT_FALSE(wallet.HaveSproutSpendingKey(addr2));
-
-    // Remove the first viewing key
-    ASSERT_TRUE(wallet.RemoveSproutViewingKey(vk));
-    ASSERT_FALSE(wallet.HaveSproutViewingKey(addr));
-    ASSERT_TRUE(wallet.HaveSproutViewingKey(addr2));
-}
-
-/**
- * This test covers methods on CWalletDB
- * WriteZKey()
- */
-TEST(wallet_zkeys_tests, write_zkey_direct_to_db) {
-    SelectParams(CBaseChainParams::TESTNET);
-
-    // Get temporary and unique path for file.
-    // Note: / operator to append paths
-    boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
-    boost::filesystem::create_directories(pathTemp);
-    mapArgs["-datadir"] = pathTemp.string();
-
-    bool fFirstRun;
-    CWallet wallet("wallet.dat");
-    ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
-
-    // No default CPubKey set
-    ASSERT_TRUE(fFirstRun);
-
-    // wallet should be empty
-    std::set<libzcash::SproutPaymentAddress> addrs;
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(0, addrs.size());
-
-    // Add random key to the wallet
-    auto paymentAddress = wallet.GenerateNewSproutZKey();
-
-    // wallet should have one key
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(1, addrs.size());
-
-    // create random key and add it to database directly, bypassing wallet
-    auto sk = libzcash::SproutSpendingKey::random();
-    auto addr = sk.address();
-    int64_t now = GetTime();
-    CKeyMetadata meta(now);
-    CWalletDB db("wallet.dat");
-    db.WriteZKey(addr, sk, meta);
-
-    // wallet should not be aware of key
-    ASSERT_FALSE(wallet.HaveSproutSpendingKey(addr));
-
-    // wallet sees one key
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(1, addrs.size());
-
-    // wallet should have default metadata for addr with null createtime
-    CKeyMetadata m = wallet.mapSproutZKeyMetadata[addr];
-    ASSERT_EQ(m.nCreateTime, 0);
-    ASSERT_NE(m.nCreateTime, now);
-
-    // load the wallet again
-    ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
-
-    // wallet can now see the spending key
-    ASSERT_TRUE(wallet.HaveSproutSpendingKey(addr));
-
-    // check key is the same
-    libzcash::SproutSpendingKey keyOut;
-    wallet.GetSproutSpendingKey(addr, keyOut);
-    ASSERT_EQ(sk, keyOut);
-
-    // wallet should have two keys
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(2, addrs.size());
-
-    // check metadata is now the same
-    m = wallet.mapSproutZKeyMetadata[addr];
-    ASSERT_EQ(m.nCreateTime, now);
-}
-
-/**
- * This test covers methods on CWalletDB
- * WriteSproutViewingKey()
- */
-TEST(wallet_zkeys_tests, WriteViewingKeyDirectToDB) {
-    SelectParams(CBaseChainParams::TESTNET);
-
-    // Get temporary and unique path for file.
-    // Note: / operator to append paths
-    boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
-    boost::filesystem::create_directories(pathTemp);
-    mapArgs["-datadir"] = pathTemp.string();
-
-    bool fFirstRun;
-    CWallet wallet("wallet-vkey.dat");
-    ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
-
-    // No default CPubKey set
-    ASSERT_TRUE(fFirstRun);
-
-    // create random viewing key and add it to database directly, bypassing wallet
-    auto sk = libzcash::SproutSpendingKey::random();
-    auto vk = sk.viewing_key();
-    auto addr = sk.address();
-    int64_t now = GetTime();
-    CKeyMetadata meta(now);
-    CWalletDB db("wallet-vkey.dat");
-    db.WriteSproutViewingKey(vk);
-
-    // wallet should not be aware of viewing key
-    ASSERT_FALSE(wallet.HaveSproutViewingKey(addr));
-
-    // load the wallet again
-    ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
-
-    // wallet can now see the viewing key
-    ASSERT_TRUE(wallet.HaveSproutViewingKey(addr));
-
-    // check key is the same
-    libzcash::SproutViewingKey vkOut;
-    wallet.GetSproutViewingKey(addr, vkOut);
-    ASSERT_EQ(vk, vkOut);
-}
-
-
-
-/**
- * This test covers methods on CWalletDB to load/save crypted z keys.
- */
-TEST(wallet_zkeys_tests, write_cryptedzkey_direct_to_db) {
-    SelectParams(CBaseChainParams::TESTNET);
-
-    // Get temporary and unique path for file.
-    // Note: / operator to append paths
-    boost::filesystem::path pathTemp = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
-    boost::filesystem::create_directories(pathTemp);
-    mapArgs["-datadir"] = pathTemp.string();
-
-    bool fFirstRun;
-    CWallet wallet("wallet_crypted.dat");
-    ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
-
-    // No default CPubKey set
-    ASSERT_TRUE(fFirstRun);
-
-    // wallet should be empty
-    std::set<libzcash::SproutPaymentAddress> addrs;
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(0, addrs.size());
-
-    // Add random key to the wallet
-    auto paymentAddress = wallet.GenerateNewSproutZKey();
-
-    // wallet should have one key
-    wallet.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(1, addrs.size());
-
-    // encrypt wallet
-    SecureString strWalletPass;
-    strWalletPass.reserve(100);
-    strWalletPass = "hello";
-    ASSERT_TRUE(wallet.EncryptWallet(strWalletPass));
-    
-    // adding a new key will fail as the wallet is locked
-    EXPECT_ANY_THROW(wallet.GenerateNewSproutZKey());
-    
-    // unlock wallet and then add
-    wallet.Unlock(strWalletPass);
-    auto paymentAddress2 = wallet.GenerateNewSproutZKey();
-
-    // Create a new wallet from the existing wallet path
-    CWallet wallet2("wallet_crypted.dat");
-    ASSERT_EQ(DB_LOAD_OK, wallet2.LoadWallet(fFirstRun));
-
-    // Confirm it's not the same as the other wallet
-    ASSERT_TRUE(&wallet != &wallet2);
-    
-    // wallet should have two keys
-    wallet2.GetSproutPaymentAddresses(addrs);
-    ASSERT_EQ(2, addrs.size());
-    
-    // check we have entries for our payment addresses
-    ASSERT_TRUE(addrs.count(paymentAddress));
-    ASSERT_TRUE(addrs.count(paymentAddress2));
-
-    // spending key is crypted, so we can't extract valid payment address
-    libzcash::SproutSpendingKey keyOut;
-    wallet2.GetSproutSpendingKey(paymentAddress, keyOut);
-    ASSERT_FALSE(paymentAddress == keyOut.address());
-    
-    // unlock wallet to get spending keys and verify payment addresses
-    wallet2.Unlock(strWalletPass);
-
-    wallet2.GetSproutSpendingKey(paymentAddress, keyOut);
-    ASSERT_EQ(paymentAddress, keyOut.address());
-    
-    wallet2.GetSproutSpendingKey(paymentAddress2, keyOut);
-    ASSERT_EQ(paymentAddress2, keyOut.address());
-}
-
 /**
  * This test covers methods on CWalletDB to load/save crypted sapling z keys.
  */

src/wallet/rpcdisclosure.cpp

@@ -1,4 +1,5 @@
 // Copyright (c) 2017 The Zcash developers
+// Copyright (c) 2019-2020 The Hush developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -187,6 +188,8 @@ UniValue z_validatepaymentdisclosure(const UniValue& params, bool fHelp, const C
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: payment disclosure is disabled.");
     }
 
+    throw JSONRPCError(RPC_WALLET_ERROR, "Error: payment disclosures not implemented for Sapling yet");
+
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     EnsureWalletIsUnlocked();
@@ -269,8 +272,9 @@ UniValue z_validatepaymentdisclosure(const UniValue& params, bool fHelp, const C
         errs.push_back("Payment disclosure signature does not match transaction signature");        
     }
    
+    /*
     // Check the payment address is valid
-    SproutPaymentAddress zaddr = pd.payload.zaddr;
+    PaymentAddress zaddr = pd.payload.zaddr;
     {
         o.push_back(Pair("paymentAddress", EncodePaymentAddress(zaddr)));
 
@@ -308,6 +312,7 @@ UniValue z_validatepaymentdisclosure(const UniValue& params, bool fHelp, const C
             errs.push_back(string("Error while decrypting payment disclosure note: ") + string(e.what()) );
         }
     }
+    */
 
     bool isValid = errs.empty();
     o.push_back(Pair("valid", isValid));