Merge pull request #434 from NAVCoin/cold-staking-index-spending

Index cold staking address unspent output by spending address
navcoin · Apr 10, 2019 · 404d85f · 404d85f
2 parents 197c460 + 0ae6115
commit 404d85f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -2430,6 +2430,8 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
                     CTxDestination destination;
                     ExtractDestination(out.scriptPubKey, destination);
                     CNavCoinAddress address(destination);
+                    if (out.scriptPubKey.IsColdStaking())
+                        address.GetSpendingAddress(address);
                     address.GetIndexKey(hashBytes, type);
 
                     // undo spending activity
@@ -2509,9 +2511,11 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
                     } else if (prevout.scriptPubKey.IsPayToPublicKey() || prevout.scriptPubKey.IsColdStaking()) {
                         uint160 hashBytes;
                         int type = 0;
-                        CTxDestination destination;
+			CTxDestination destination;
                         ExtractDestination(prevout.scriptPubKey, destination);
                         CNavCoinAddress address(destination);
+                        if (prevout.scriptPubKey.IsColdStaking())
+                            address.GetSpendingAddress(address);
                         address.GetIndexKey(hashBytes, type);
 
                         // undo spending activity
@@ -2975,6 +2979,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                         CTxDestination destination;
                         ExtractDestination(prevout.scriptPubKey, destination);
                         CNavCoinAddress address(destination);
+                        if (prevout.scriptPubKey.IsColdStaking())
+                            address.GetSpendingAddress(address);
                         address.GetIndexKey(hashBytes, addressType);
                     } else {
                         hashBytes.SetNull();
@@ -3091,9 +3097,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                 } else if (out.scriptPubKey.IsPayToPublicKey() || out.scriptPubKey.IsColdStaking()) {
                     uint160 hashBytes;
                     int type = 0;
-                    CTxDestination destination;
+		    CTxDestination destination;
                     ExtractDestination(out.scriptPubKey, destination);
                     CNavCoinAddress address(destination);
+                    if (out.scriptPubKey.IsColdStaking())
+                        address.GetSpendingAddress(address);
                     address.GetIndexKey(hashBytes, type);
 
                     // undo spending activity