Skip to content

Commit

Permalink
3.7.15.0]-Leisure
Browse files Browse the repository at this point in the history
Changed
 - Balance now includes unconfirmed coins sent by self, #1192 (@Foggyx420).
  • Loading branch information
denravonska committed Jul 18, 2018
2 parents 0ce12a7 + 0bb1f69 commit 886d9c0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [3.7.15.0] 2018-07-18
### Changed
- Balance now includes unconfirmed coins sent by self, #1192 (@Foggyx420).

## [3.7.14.0] 2018-07-17
### Added
- Support for Qt 5.9 (@thecharlatan)
- Compatibility with boost-1.67 (@ravon)
- Compatibility with boost-1.67 (@denravonska)
- Calculations to reduce network time offset (@jamescowens)
- Feedback for addnode RPC command (@tomasbrod)
- Added data acquisiton commands (@tomasbrod):
Expand All @@ -27,7 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- RPC server refactoring (Wladimir J. van der Laan) (@thecharlatan)
- Replace json spirit with Univalue JSON library (@thecharlatan)
- Change repository URL (@Foggyx420)
- Pretty-print rpc output (@ravon)
- Pretty-print rpc output (@denravonska)
- Logging for debugging reward computation (@tomasbrod)
- Clean-up beacon manipulation (@Foggyx420)

Expand All @@ -37,7 +41,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- neural network fixes (@Foggyx420)
- investor cpid's appearing as zeros in block index (@tomasbrod)
- ensure that daemon functionality is correct when built together with gui wallet (@jamescowens)
- improve logging, remove empty lines (@jamescowens) (@Foggyx420) (@tomasbrod) (@ravon)
- improve logging, remove empty lines (@jamescowens) (@Foggyx420) (@tomasbrod) (@denravonska)
- windows socket warnings (@thecharlatan)

### Removed
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 3)
define(_CLIENT_VERSION_MINOR, 7)
define(_CLIENT_VERSION_REVISION, 14)
define(_CLIENT_VERSION_REVISION, 15)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2018)
Expand Down
2 changes: 1 addition & 1 deletion src/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ int64_t CWallet::GetBalance() const
for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{
const CWalletTx* pcoin = &(*it).second;
if (pcoin->IsTrusted() && pcoin->IsConfirmed())
if (pcoin->IsTrusted() && (pcoin->IsConfirmed() || pcoin->fFromMe))
nTotal += pcoin->GetAvailableCredit();
}
}
Expand Down

0 comments on commit 886d9c0

Please sign in to comment.