DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'refactor_times' of git://github.com/luke-jr/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen
2012-09-18 10:59:31 -04:00
parent 5add0b0d0f da7b8c1260
commit a0971337d0
6 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet.h
View File

@@ -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;