diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-10-19 18:34:06 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-10-26 14:51:46 +0200 |
| commit | 00588c3fac4822d42ffde46ca55c029a74c378ee (patch) | |
| tree | 9e3d048531cae00793f32b9e4a05116986cc1f58 /src/wallet.h | |
| parent | e010af7089b18af838b74a4dc7908885c1600d13 (diff) | |
Use boost signals for callbacks from main to wallet
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wallet.h b/src/wallet.h index 7598efc1ab..21510f8c39 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -80,7 +80,7 @@ public: /** A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, * and provides the ability to create new transactions. */ -class CWallet : public CCryptoKeyStore +class CWallet : public CCryptoKeyStore, public CWalletInterface { private: bool SelectCoins(int64 nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64& nValueRet) const; @@ -197,8 +197,9 @@ public: void MarkDirty(); bool AddToWallet(const CWalletTx& wtxIn); - bool AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& tx, const CBlock* pblock, bool fUpdate = false, bool fFindBlock = false); - bool EraseFromWallet(uint256 hash); + void SyncTransaction(const uint256 &hash, const CTransaction& tx, const CBlock* pblock); + bool AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& tx, const CBlock* pblock, bool fUpdate); + void EraseFromWallet(const uint256 &hash); void WalletUpdateSpent(const CTransaction& prevout); int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); void ReacceptWalletTransactions(); @@ -887,6 +888,4 @@ private: std::vector<char> _ssExtra; }; -bool GetWalletFile(CWallet* pwallet, std::string &strWalletFileOut); - #endif |