aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-09-18 10:59:31 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-09-18 10:59:31 -0400
commita0971337d0ce2451e576d51643e869d0cb931292 (patch)
treec45e4c577b7f3847c27a7c7314e481bca93b50de /src/wallet.h
parent5add0b0d0ff56774ca4716240a615175d79e82ec (diff)
parentda7b8c1260d91e3306eb18dd65633567cb31332f (diff)
downloadbitcoin-a0971337d0ce2451e576d51643e869d0cb931292.tar.xz
Merge branch 'refactor_times' of git://github.com/luke-jr/bitcoin
Diffstat (limited to 'src/wallet.h')
-rw-r--r--src/wallet.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/wallet.h b/src/wallet.h
index 7fd33629fe..516ad3fa50 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;