Handle "conflicted" transactions properly
authorMASM fan <masmfan@gmail.com>
Sun, 16 Feb 2014 00:47:42 +0000 (04:47 +0400)
committerMASM fan <masmfan@gmail.com>
Sun, 16 Feb 2014 00:47:42 +0000 (04:47 +0400)
commit35be24faa1ab82f3178f278a04436eade50b5093
tree448b5d5526be9b613bc4bf6c33174891ad31054c
parentc8a225331fe4690ce6358a6a32434a87c16ea099
Handle "conflicted" transactions properly

- Extend CMerkleTx::GetDepthInMainChain with the concept of a "conflicted" transaction - a transaction generated by the wallet that is not in the main chain or in the mempool, and, therefore, will likely never be confirmed.

- Exclamation mark icon for conflicted transactions
- Show mouseover status for conflicted transactions as "conflicted"
- Don't show inactive transactions on overview page overview
16 files changed:
src/main.cpp
src/qt/bitcoin.qrc
src/qt/overviewpage.cpp
src/qt/res/icons/transaction_conflicted.png [new file with mode: 0644]
src/qt/transactiondesc.cpp
src/qt/transactionfilterproxy.cpp
src/qt/transactionfilterproxy.h
src/qt/transactionrecord.cpp
src/qt/transactionrecord.h
src/qt/transactiontablemodel.cpp
src/qt/transactiontablemodel.h
src/qt/walletmodel.cpp
src/rpcwallet.cpp
src/version.h
src/wallet.cpp
src/wallet.h