Merge branch '0.4.x' into 0.5.0.x

Conflicts:
	src/main.cpp

1 files changed, 11 insertions, 0 deletions

diff --git a/src/key.h b/src/key.h
index df5cfeb32c..010591632e 100644
--- a/src/key.h
+++ b/src/key.h
@@ -387,6 +387,17 @@ public:
     {
         return CBitcoinAddress(GetPubKey());
     }
+
+    bool IsValid()
+    {
+        if (!fSet)
+            return false;
+
+        CSecret secret = GetSecret();
+        CKey key2;
+        key2.SetSecret(secret);
+        return GetPubKey() == key2.GetPubKey();
+    }
 };
 
 #endif