@ -705,9 +705,9 @@ DBErrors CWallet::ReorderTransactions()
@@ -705,9 +705,9 @@ DBErrors CWallet::ReorderTransactions()
typedef std : : multimap < int64_t , TxPair > TxItems ;
TxItems txByTime ;
for ( std : : map < uint256 , CWalletTx > : : iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( auto & entry : mapWalle t)
{
CWalletTx * wtx = & ( ( * it ) . second ) ;
CWalletTx * wtx = & entry . second ;
txByTime . insert ( std : : make_pair ( wtx - > nTimeReceived , TxPair ( wtx , nullptr ) ) ) ;
}
std : : list < CAccountingEntry > acentries ;
@ -2026,9 +2026,9 @@ CAmount CWallet::GetBalance() const
@@ -2026,9 +2026,9 @@ CAmount CWallet::GetBalance() const
CAmount nTotal = 0 ;
{
LOCK2 ( cs_main , cs_wallet ) ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const CWalletTx * pcoin = & ( * it ) . second ;
const CWalletTx * pcoin = & entry . second ;
if ( pcoin - > IsTrusted ( ) )
nTotal + = pcoin - > GetAvailableCredit ( ) ;
}
@ -2042,9 +2042,9 @@ CAmount CWallet::GetUnconfirmedBalance() const
@@ -2042,9 +2042,9 @@ CAmount CWallet::GetUnconfirmedBalance() const
CAmount nTotal = 0 ;
{
LOCK2 ( cs_main , cs_wallet ) ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const CWalletTx * pcoin = & ( * it ) . second ;
const CWalletTx * pcoin = & entry . second ;
if ( ! pcoin - > IsTrusted ( ) & & pcoin - > GetDepthInMainChain ( ) = = 0 & & pcoin - > InMempool ( ) )
nTotal + = pcoin - > GetAvailableCredit ( ) ;
}
@ -2057,9 +2057,9 @@ CAmount CWallet::GetImmatureBalance() const
@@ -2057,9 +2057,9 @@ CAmount CWallet::GetImmatureBalance() const
CAmount nTotal = 0 ;
{
LOCK2 ( cs_main , cs_wallet ) ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const CWalletTx * pcoin = & ( * it ) . second ;
const CWalletTx * pcoin = & entry . second ;
nTotal + = pcoin - > GetImmatureCredit ( ) ;
}
}
@ -2071,9 +2071,9 @@ CAmount CWallet::GetWatchOnlyBalance() const
@@ -2071,9 +2071,9 @@ CAmount CWallet::GetWatchOnlyBalance() const
CAmount nTotal = 0 ;
{
LOCK2 ( cs_main , cs_wallet ) ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const CWalletTx * pcoin = & ( * it ) . second ;
const CWalletTx * pcoin = & entry . second ;
if ( pcoin - > IsTrusted ( ) )
nTotal + = pcoin - > GetAvailableWatchOnlyCredit ( ) ;
}
@ -2087,9 +2087,9 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
@@ -2087,9 +2087,9 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
CAmount nTotal = 0 ;
{
LOCK2 ( cs_main , cs_wallet ) ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const CWalletTx * pcoin = & ( * it ) . second ;
const CWalletTx * pcoin = & entry . second ;
if ( ! pcoin - > IsTrusted ( ) & & pcoin - > GetDepthInMainChain ( ) = = 0 & & pcoin - > InMempool ( ) )
nTotal + = pcoin - > GetAvailableWatchOnlyCredit ( ) ;
}
@ -2102,9 +2102,9 @@ CAmount CWallet::GetImmatureWatchOnlyBalance() const
@@ -2102,9 +2102,9 @@ CAmount CWallet::GetImmatureWatchOnlyBalance() const
CAmount nTotal = 0 ;
{
LOCK2 ( cs_main , cs_wallet ) ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const CWalletTx * pcoin = & ( * it ) . second ;
const CWalletTx * pcoin = & entry . second ;
nTotal + = pcoin - > GetImmatureWatchOnlyCredit ( ) ;
}
}
@ -2178,10 +2178,10 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
@@ -2178,10 +2178,10 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
CAmount nTotal = 0 ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; + + i t)
for ( const auto & entry : mapWalle t)
{
const uint256 & wtxid = it - > first ;
const CWalletTx * pcoin = & ( * it ) . second ;
const uint256 & wtxid = entry . first ;
const CWalletTx * pcoin = & entry . second ;
if ( ! CheckFinalTx ( * pcoin - > tx ) )
continue ;
@ -2242,10 +2242,10 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
@@ -2242,10 +2242,10 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
if ( pcoin - > tx - > vout [ i ] . nValue < nMinimumAmount | | pcoin - > tx - > vout [ i ] . nValue > nMaximumAmount )
continue ;
if ( coinControl & & coinControl - > HasSelected ( ) & & ! coinControl - > fAllowOtherInputs & & ! coinControl - > IsSelected ( COutPoint ( ( * it ) . first , i ) ) )
if ( coinControl & & coinControl - > HasSelected ( ) & & ! coinControl - > fAllowOtherInputs & & ! coinControl - > IsSelected ( COutPoint ( entry . first , i ) ) )
continue ;
if ( IsLockedCoin ( ( * it ) . first , i ) )
if ( IsLockedCoin ( entry . first , i ) )
continue ;
if ( IsSpent ( wtxid , i ) )
@ -3705,9 +3705,9 @@ void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) c
@@ -3705,9 +3705,9 @@ void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) c
// find first block that affects those keys, if there are any left
std : : vector < CKeyID > vAffected ;
for ( std : : map < uint256 , CWalletTx > : : const_iterator it = mapWallet . begin ( ) ; it ! = mapWallet . end ( ) ; it + + ) {
for ( const auto & entry : mapWallet ) {
// iterate over all wallet transactions...
const CWalletTx & wtx = ( * it ) . second ;
const CWalletTx & wtx = entry . second ;
BlockMap : : const_iterator blit = mapBlockIndex . find ( wtx . hashBlock ) ;
if ( blit ! = mapBlockIndex . end ( ) & & chainActive . Contains ( blit - > second ) ) {
// ... which are already in a block
@ -3727,8 +3727,8 @@ void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) c
@@ -3727,8 +3727,8 @@ void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) c
}
// Extract block timestamps for those keys
for ( std : : map < CKeyID , CBlockIndex * > : : const_iterator it = mapKeyFirstBlock . begin ( ) ; it ! = mapKeyFirstBlock . end ( ) ; it + + )
mapKeyBirth [ it - > first ] = it - > second - > GetBlockTime ( ) - TIMESTAMP_WINDOW ; // block times can be 2h off
for ( const auto & entry : mapKeyFirstBlock )
mapKeyBirth [ entry . first ] = entry . second - > GetBlockTime ( ) - TIMESTAMP_WINDOW ; // block times can be 2h off
}
/**