Add support for PopAnchor(.., SPROUT/SAPLING)

2018-05-06 19:05:11 -06:00
parent 27616b9a04
commit c643ff0b51
4 changed files with 30 additions and 16 deletions
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -281,13 +281,27 @@ void CCoinsViewCache::AbstractPopAnchor(
    }
 }

-void CCoinsViewCache::PopAnchor(const uint256 &newrt) {
-    AbstractPopAnchor<ZCIncrementalMerkleTree, CAnchorsSproutMap, CAnchorsSproutCacheEntry>(
-        newrt,
-        SPROUT,
-        cacheSproutAnchors,
-        hashSproutAnchor
-    );
+void CCoinsViewCache::PopAnchor(const uint256 &newrt, ShieldedType type) {
+    switch (type) {
+        case SPROUT:
+            AbstractPopAnchor<ZCIncrementalMerkleTree, CAnchorsSproutMap, CAnchorsSproutCacheEntry>(
+                newrt,
+                SPROUT,
+                cacheSproutAnchors,
+                hashSproutAnchor
+            );
+            break;
+        case SAPLING:
+            AbstractPopAnchor<ZCSaplingIncrementalMerkleTree, CAnchorsSaplingMap, CAnchorsSaplingCacheEntry>(
+                newrt,
+                SAPLING,
+                cacheSaplingAnchors,
+                hashSaplingAnchor
+            );
+            break;
+        default:
+            throw std::runtime_error("Unknown shielded type " + type);
+    }
 }

 void CCoinsViewCache::SetNullifiers(const CTransaction& tx, bool spent) {