diff --git a/Account.h b/Account.h deleted file mode 100644 index ee4763c77..000000000 --- a/Account.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef __ACCOUNT__ -#define __ACCOUNT__ - -#include -#include "key.h" -#include "uint256.h" - -class Account -{ -public: - typedef boost::shared_ptr pointer; - -private: - uint160 mAddress; - CKey pubKey; - -public: - - bool checkSignRaw(const std::vector &toSign, - const std::vector &signature) const; - const uint160& getAddress(void) const { return mAddress; } - CKey& peekPubKey() { return pubKey; } -}; - -#endif diff --git a/Transaction.cpp b/Transaction.cpp index a09ac7fa7..c4d08940d 100644 --- a/Transaction.cpp +++ b/Transaction.cpp @@ -3,7 +3,6 @@ #include "Application.h" #include "Transaction.h" #include "Wallet.h" -#include "Account.h" #include "BitcoinUtil.h" #include "BinaryFormats.h" diff --git a/Transaction.h b/Transaction.h index b0d0e83d4..e04332b13 100644 --- a/Transaction.h +++ b/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;