From 42a862650b4cfbe7a3f0c156cef68be4f7fa3a99 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Fri, 5 Jun 2020 01:34:55 -0400
Subject: [PATCH] desprout

---
 src/key_io.cpp           | 14 --------------
 src/key_io.h             |  1 +
 src/test/coins_tests.cpp | 17 +----------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/key_io.cpp b/src/key_io.cpp
index 2626a0b9b..319c24eef 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -344,20 +344,6 @@ std::string EncodeSpendingKey(const libzcash::SpendingKey& zkey)
 libzcash::SpendingKey DecodeSpendingKey(const std::string& str)
 {
     std::vector<unsigned char> data;
-    if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& zkey_prefix = Params().Base58Prefix(CChainParams::ZCSPENDING_KEY);
-        if ((data.size() == libzcash::SerializedSproutSpendingKeySize + zkey_prefix.size()) &&
-            std::equal(zkey_prefix.begin(), zkey_prefix.end(), data.begin())) {
-            CSerializeData serialized(data.begin() + zkey_prefix.size(), data.end());
-            CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
-            libzcash::SproutSpendingKey ret;
-            ss >> ret;
-            memory_cleanse(serialized.data(), serialized.size());
-            memory_cleanse(data.data(), data.size());
-            return ret;
-        }
-    }
-    data.clear();
     auto bech = bech32::Decode(str);
     if (bech.first == Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_SPEND_KEY) &&
         bech.second.size() == ConvertedSaplingExtendedSpendingKeySize) {
diff --git a/src/key_io.h b/src/key_io.h
index 013469ab6..567c9a2f2 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -1,6 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Copyright (c) 2016-2018 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.
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index bb6432a81..8067b42b9 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2014 The Bitcoin Core 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.
 
@@ -39,22 +40,6 @@ public:
         hashBestSaplingAnchor_ = SaplingMerkleTree::empty_root();
     }
 
-    bool GetSproutAnchorAt(const uint256& rt, SproutMerkleTree &tree) const {
-        if (rt == SproutMerkleTree::empty_root()) {
-            SproutMerkleTree new_tree;
-            tree = new_tree;
-            return true;
-        }
-
-        std::map<uint256, SproutMerkleTree>::const_iterator it = mapSproutAnchors_.find(rt);
-        if (it == mapSproutAnchors_.end()) {
-            return false;
-        } else {
-            tree = it->second;
-            return true;
-        }
-    }
-
     bool GetSaplingAnchorAt(const uint256& rt, SaplingMerkleTree &tree) const {
         if (rt == SaplingMerkleTree::empty_root()) {
             SaplingMerkleTree new_tree;