Made obsolete by the pubkey cache.

Account.h

@@ -1,25 +0,0 @@
-#ifndef __ACCOUNT__
-#define __ACCOUNT__
-
-#include <boost/shared_ptr.hpp>
-#include "key.h"
-#include "uint256.h"
-
-class Account
-{
-public:
-	typedef boost::shared_ptr<Account> pointer;
-
-private:
-    uint160 mAddress;
-    CKey pubKey;
-
-public:
-
-  bool checkSignRaw(const std::vector<unsigned char> &toSign,
-    const std::vector<unsigned char> &signature) const;
-  const uint160& getAddress(void) const { return mAddress; }
-  CKey& peekPubKey() { return pubKey; }
-};
-
-#endif

Transaction.cpp

@@ -3,7 +3,6 @@
 #include "Application.h"
 #include "Transaction.h"
 #include "Wallet.h"
-#include "Account.h"
 #include "BitcoinUtil.h"
 #include "BinaryFormats.h"
 

Transaction.h

@@ -10,7 +10,6 @@
 #include "newcoin.pb.h"
 #include "Hanko.h"
 #include "Serializer.h"
-#include "Account.h"
 #include "SHAMap.h"
 
 /*
@@ -25,7 +24,9 @@ enum TransStatus
 	CONFLICTED	=3,	// losing to a conflicting transaction
 	COMMITTED	=4,	// known to be in a ledger
 	HELD		=5,	// not valid now, maybe later
-	REMOVED		=6	// taken out of a ledger
+	REMOVED		=6,	// taken out of a ledger
+	OBSOLETE	=7, // a compatible transaction has taken precedence
+	INCOMPLETE	=8  // needs more signatures
 };
 
 class Account;