Gavin Andresen 2b72d46f42 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.

GetDepthInMainChain() now returns -1 for conflicted transactions
(0 for unconfirmed-but-in-the-mempool, and >1 for confirmed).

This makes getbalance, getbalance '*', and listunspent all agree when there are
mutated transactions in the wallet.

Before:
 listunspent: one 49BTC output
 getbalance: 96 BTC (change counted twice)
 getbalance '*': 46 BTC (spends counted twice)

After: all agree, 49 BTC available to spend.

2014-02-14 11:08:40 -05:00

..

forms

qt: Fix tab order in send and receive tab

2014-01-29 14:41:41 +01:00

locale

Final bitcoin_en update before 0.9.0rc1

2014-01-30 10:14:00 +01:00

res

qt: use series of pngs for spinner

2014-01-13 14:45:23 +01:00

test

build: use -mwindows for gui targets when linking with mingw

2014-01-27 15:30:51 -05:00

addressbookpage.cpp

[Qt] harmonize strings used when exporting in addressbookpage

2014-01-27 08:36:14 +01:00

addressbookpage.h

[Qt] make most Windows appear centered on main GUI

2013-11-14 19:58:00 +01:00

addresstablemodel.cpp

qt: add missing cs_wallet lock in AddressTableModel::setData

2014-01-06 10:34:33 +01:00

addresstablemodel.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

askpassphrasedialog.cpp

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

askpassphrasedialog.h

[Qt] make most Windows appear centered on main GUI

2013-11-14 19:58:00 +01:00

bitcoin.cpp

[Qt] remove broken OptionsModel::Upgrade()

2014-02-07 12:27:41 +01:00

bitcoin.qrc

qt: use series of pngs for spinner

2014-01-13 14:45:23 +01:00

bitcoinaddressvalidator.cpp

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

bitcoinaddressvalidator.h

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

bitcoinamountfield.cpp

qt: Fix tab order in send and receive tab

2014-01-29 14:41:41 +01:00

bitcoinamountfield.h

qt: add license header to source files

2013-11-04 16:27:09 +01:00

bitcoingui.cpp

[Qt] move helpmessage from debug window to main menu

2014-01-22 15:28:50 +01:00

bitcoingui.h

[Qt] move helpmessage from debug window to main menu

2014-01-22 15:28:50 +01:00

bitcoinstrings.cpp

qt: English translation update

2014-01-13 17:36:24 +01:00

bitcoinunits.cpp

qt: add license header to source files

2013-11-04 16:27:09 +01:00

bitcoinunits.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

clientmodel.cpp

qt: Treat regtest as testnet

2013-12-20 11:18:50 +01:00

clientmodel.h

qt: Treat regtest as testnet

2013-12-20 11:18:50 +01:00

coincontroldialog.cpp

[Qt] coin control change address handling update

2013-12-20 15:50:21 +01:00

coincontroldialog.h

Coincontrol cleanup (e.g. add missing license)

2013-11-18 08:16:12 +01:00

coincontroltreewidget.cpp

Coincontrol cleanup (e.g. add missing license)

2013-11-18 08:16:12 +01:00

coincontroltreewidget.h

Coincontrol cleanup (e.g. add missing license)

2013-11-18 08:16:12 +01:00

csvmodelwriter.cpp

qt: add license header to source files

2013-11-04 16:27:09 +01:00

csvmodelwriter.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

editaddressdialog.cpp

[Qt] style-police, add missing license headers

2013-12-17 07:56:40 +01:00

editaddressdialog.h

[Qt] make most Windows appear centered on main GUI

2013-11-14 19:58:00 +01:00

guiconstants.h

qt: use series of pngs for spinner

2014-01-13 14:45:23 +01:00

guiutil.cpp

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

guiutil.h

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

intro.cpp

[Qt] display native dir separators in select dadatir dialog

2014-01-10 11:43:29 +01:00

intro.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

macdockiconhandler.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

macdockiconhandler.mm

[Qt] style-police, add missing license headers

2013-12-17 07:56:40 +01:00

macnotificationhandler.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

macnotificationhandler.mm

[Qt] style-police, add missing license headers

2013-12-17 07:56:40 +01:00

Makefile.am

qt: Fix Windows/Darwin executable metadata

2014-01-29 15:05:42 +01:00

monitoreddatamapper.cpp

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

monitoreddatamapper.h

qt: add license header to source files

2013-11-04 16:27:09 +01:00

notificator.cpp

qt5: fix a build issue with osx and qtdbus

2014-01-10 16:30:33 -05:00

notificator.h

[Qt] small notificator and style changes

2013-12-03 14:01:53 +01:00

openuridialog.cpp

Payment request URI syntax changed, from request=... to r=...

2013-12-04 13:18:09 +10:00

openuridialog.h

[Qt] make most Windows appear centered on main GUI

2013-11-14 19:58:00 +01:00

optionsdialog.cpp

[Qt] let OptionsModel::getProxySettings() directly query proxy

2014-01-17 15:43:44 +01:00

optionsdialog.h

[Qt] massive options/settings rework (no core changes)

2014-01-06 16:19:04 +01:00

optionsmodel.cpp

[Qt] remove broken OptionsModel::Upgrade()

2014-02-07 12:27:41 +01:00

optionsmodel.h

[Qt] remove broken OptionsModel::Upgrade()

2014-02-07 12:27:41 +01:00

overviewpage.cpp

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

overviewpage.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

paymentrequest.proto

Payment Protocol: X509-validated payment requests

2013-08-22 16:18:25 +10:00

paymentrequestplus.cpp

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

paymentrequestplus.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

paymentserver.cpp

[Qt] let OptionsModel::getProxySettings() directly query proxy

2014-01-17 15:43:44 +01:00

paymentserver.h

Merge pull request #3374

2014-01-13 17:11:05 +01:00

qvalidatedlineedit.cpp

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

qvalidatedlineedit.h

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

qvaluecombobox.cpp

qt: add license header to source files

2013-11-04 16:27:09 +01:00

qvaluecombobox.h

qt: add license header to source files

2013-11-04 16:27:09 +01:00

receivecoinsdialog.cpp

[Qt] minor receive tab improvements

2014-01-29 14:20:15 +01:00

receivecoinsdialog.h

[Qt] minor receive tab improvements

2014-01-29 14:20:15 +01:00

receiverequestdialog.cpp

qt: keep a list of requested payments

2013-11-19 14:07:38 +01:00

receiverequestdialog.h

qt: add license header to source files

2013-11-04 16:27:09 +01:00

recentrequeststablemodel.cpp

[Qt] minor receive tab improvements

2014-01-29 14:20:15 +01:00

recentrequeststablemodel.h

[Qt] fix bitcoin: URI strings (spelling fixes)

2014-01-28 10:48:41 +01:00

rpcconsole.cpp

[Qt] move helpmessage from debug window to main menu

2014-01-22 15:28:50 +01:00

rpcconsole.h

[Qt] move helpmessage from debug window to main menu

2014-01-22 15:28:50 +01:00

sendcoinsdialog.cpp

qt: Fix tab order in send and receive tab

2014-01-29 14:41:41 +01:00

sendcoinsdialog.h

[Qt] allow deletion of payment-requests in sendcoins

2013-11-24 16:30:14 +01:00

sendcoinsentry.cpp

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

sendcoinsentry.h

[Qt] allow deletion of payment-requests in sendcoins

2013-11-24 16:30:14 +01:00

signverifymessagedialog.cpp

[Qt] extend validate line edit and btc address validator

2014-01-29 14:15:55 +01:00

signverifymessagedialog.h

[Qt] make most Windows appear centered on main GUI

2013-11-14 19:58:00 +01:00

splashscreen.cpp

[Qt] very minor style cleanups

2014-01-22 09:46:15 +01:00

splashscreen.h

qt: Remove global references in bitcoin.cpp

2014-01-11 10:20:28 +01:00

trafficgraphwidget.cpp

qt: add license header to source files

2013-11-04 16:27:09 +01:00

trafficgraphwidget.h

qt: add license header to source files

2013-11-04 16:27:09 +01:00

transactiondesc.cpp

Handle "conflicted" transactions properly

2014-02-14 11:08:40 -05:00

transactiondesc.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

transactiondescdialog.cpp

qt: add license header to source files

2013-11-04 16:27:09 +01:00

transactiondescdialog.h

qt: add license header to source files

2013-11-04 16:27:09 +01:00

transactionfilterproxy.cpp

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

transactionfilterproxy.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

transactionrecord.cpp

Rename IsConfirmed to IsTrusted to better match the intended behavior.

2014-02-12 16:23:06 -08:00

transactionrecord.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

transactiontablemodel.cpp

qt: Better status text for mined transactions

2014-01-06 16:30:19 +01:00

transactiontablemodel.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

transactionview.cpp

[Qt] make most Windows appear centered on main GUI

2013-11-14 19:58:00 +01:00

transactionview.h

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

utilitydialog.cpp

qt: Add closing newline to help message

2014-01-29 17:20:26 +01:00

utilitydialog.h

[Qt] add utilitydialog.cpp/h and helpmessage class

2014-01-18 16:57:02 +01:00

walletframe.cpp

qt: GUI support for -disablewallet mode

2013-11-13 09:22:00 +01:00

walletframe.h

qt: GUI support for -disablewallet mode

2013-11-13 09:22:00 +01:00

walletmodel.cpp

Handle "conflicted" transactions properly

2014-02-14 11:08:40 -05:00

walletmodel.h

[Qt] very minor style cleanups

2014-01-22 09:46:15 +01:00

walletmodeltransaction.cpp

Cleanup code using forward declarations.

2013-11-10 09:36:28 -06:00

walletmodeltransaction.h

[Qt] style-police, add missing license headers

2013-12-17 07:56:40 +01:00

walletview.cpp

[Qt] small notificator and style changes

2013-12-03 14:01:53 +01:00

walletview.h

[Qt] small notificator and style changes

2013-12-03 14:01:53 +01:00