update fSpent flag on wallet transactions if they're seen spent in case copy of wallet.dat was used elsewhere or restored from backup,

better error dialog box if try to spend already spent coins, 
got rid of unused notebook with only one tab on main dialog, 
nicer looking About dialog, 
resize About dialog better on linux

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@55 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 27 insertions, 1 deletions

diff --git a/main.h b/main.h
index 716485e93d..14c445c70e 100644
--- a/main.h
+++ b/main.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Satoshi Nakamoto

+// Copyright (c) 2009-2010 Satoshi Nakamoto

 // Distributed under the MIT/X11 software license, see the accompanying

 // file license.txt or http://www.opensource.org/licenses/mit-license.php.

 

@@ -56,6 +56,7 @@ FILE* AppendBlockFile(unsigned int& nFileRet);
 bool AddKey(const CKey& key);

 vector<unsigned char> GenerateNewKey();

 bool AddToWallet(const CWalletTx& wtxIn);

+void WalletUpdateSpent(const COutPoint& prevout);

 void ReacceptWalletTransactions();

 void RelayWalletTransactions();

 bool LoadBlockIndex(bool fAllowNew=true);

@@ -1370,6 +1371,31 @@ public:
 

 

 

+//

+// Private key that includes an expiration date in case it never gets used.

+//

+class CWalletKey

+{

+public:

+    CPrivKey vchPrivKey;

+    int64 nTimeCreated;

+    int64 nTimeExpires;

+

+    CWalletKey(int64 nTimeExpiresIn=0)

+    {

+        nTimeCreated = (nTimeExpiresIn ? GetTime() : 0);

+        nTimeExpires = nTimeExpiresIn;

+    }

+

+    IMPLEMENT_SERIALIZE

+    (

+        if (!(nType & SER_GETHASH))

+            READWRITE(nVersion);

+        READWRITE(vchPrivKey);

+        READWRITE(nTimeCreated);

+        READWRITE(nTimeExpires);

+    )

+};