diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 17:02:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 17:03:09 +0100 |
| commit | d2228384de3a870803697a6cc95467b97e9a37a5 (patch) | |
| tree | 23fb8038aa7e37d344617dbaccfbf8c5cf05b389 /src/wallet/wallet.cpp | |
| parent | 4f4dc5ef7295e85531127cd08a822291e548b2f0 (diff) | |
| parent | 7d0bf0bb4652fad052d5bf3ca3bf883754b46ead (diff) | |
| download | bitcoin-d2228384de3a870803697a6cc95467b97e9a37a5.tar.xz | |
Merge #6480: include the chaintip blockindex in the SyncTransaction signal, add signal UpdateTip()
7d0bf0b include the chaintip *blockIndex in the SyncTransaction signal (Jonas Schnelli)
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ca7cd0c285..ade460d6ac 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -896,7 +896,7 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx) } } -void CWallet::SyncTransaction(const CTransaction& tx, const CBlock* pblock) +void CWallet::SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock) { LOCK2(cs_main, cs_wallet); |