diff options
| author | Gavin Andresen <[email protected]> | 2012-09-18 10:59:31 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-09-18 10:59:31 -0400 |
| commit | a0971337d0ce2451e576d51643e869d0cb931292 (patch) | |
| tree | c45e4c577b7f3847c27a7c7314e481bca93b50de /src/wallet.h | |
| parent | Bump client version to 0.7.0.99 now that 0.7.0 release is final. (diff) | |
| parent | Bugfix: Initialize CWallet::nOrderPosNext on an empty wallet, and save it in db (diff) | |
| download | discoin-a0971337d0ce2451e576d51643e869d0cb931292.tar.xz discoin-a0971337d0ce2451e576d51643e869d0cb931292.zip | |
Merge branch 'refactor_times' of git://github.com/luke-jr/bitcoin
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/wallet.h b/src/wallet.h index 7fd33629f..516ad3fa5 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -98,6 +98,7 @@ public: fFileBacked = false; nMasterKeyMaxID = 0; pwalletdbEncryption = NULL; + nOrderPosNext = 0; } CWallet(std::string strWalletFileIn) { @@ -107,6 +108,7 @@ public: fFileBacked = true; nMasterKeyMaxID = 0; pwalletdbEncryption = NULL; + nOrderPosNext = 0; } std::map<uint256, CWalletTx> mapWallet; @@ -144,6 +146,11 @@ public: bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase); bool EncryptWallet(const SecureString& strWalletPassphrase); + /** Increment the next transaction order id + @return next transaction order id + */ + int64 IncOrderPosNext(); + typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair; typedef std::multimap<int64, TxPair > TxItems; |