From: MASM fan <masmfan@gmail.com>
Date: Tue, 13 Jan 2015 19:02:35 +0000 (-0800)
Subject: Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
X-Git-Tag: nvc-v0.5.1~4
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=c6444ebc7248037fccd5ff6e66f0b180f84a6302;hp=6db4fbd4f5551a96c74b4d54b6f09875658a27e8;p=novacoin.git

Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
---

diff --git a/src/wallet.cpp b/src/wallet.cpp
index 9972627..3906f27 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -2209,17 +2209,16 @@ void CWallet::PrintWallet(const CBlock& block)
 {
     {
         LOCK(cs_wallet);
-        if (block.IsProofOfWork() && mapWallet.count(block.vtx[0].GetHash()))
-        {
-            CWalletTx& wtx = mapWallet[block.vtx[0].GetHash()];
-            printf("    mine:  %d  %d  %" PRId64 "", wtx.GetDepthInMainChain(), wtx.GetBlocksToMaturity(), wtx.GetCredit(MINE_ALL));
-        }
         if (block.IsProofOfStake() && mapWallet.count(block.vtx[1].GetHash()))
         {
             CWalletTx& wtx = mapWallet[block.vtx[1].GetHash()];
-            printf("    stake: %d  %d  %" PRId64 "", wtx.GetDepthInMainChain(), wtx.GetBlocksToMaturity(), wtx.GetCredit(MINE_ALL));
-         }
-
+            printf("    PoS: %d  %d  %" PRId64 "", wtx.GetDepthInMainChain(), wtx.GetBlocksToMaturity(), wtx.GetCredit(MINE_ALL));
+        }
+        else if (mapWallet.count(block.vtx[0].GetHash()))
+        {
+            CWalletTx& wtx = mapWallet[block.vtx[0].GetHash()];
+            printf("    PoW:  %d  %d  %" PRId64 "", wtx.GetDepthInMainChain(), wtx.GetBlocksToMaturity(), wtx.GetCredit(MINE_ALL));
+        }
     }
     printf("\n");
 }