aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-02-16Merge pull request #3676Wladimir J. van der Laan
29d4507 qt: Add option to (not) spend unconfirmed change (Wladimir J. van der Laan)
2014-02-16qt: Add option to (not) spend unconfirmed changeWladimir J. van der Laan
- Add a wallet tab to options dialog - Move fee setting to wallet tab - Add new setting to set -nospendzeroconfchange from UI
2014-02-15Merge pull request #3671 from gavinandresen/txn_conflictsGavin Andresen
Report transaction conflicts, and tentative account balance fix
2014-02-14Track and report wallet transaction clonesGavin Andresen
Adds a "walletconflicts" array to transaction info; if a wallet transaction is mutated, the alternate transaction id or ids are reported there (usually the array will be empty). Metadata from the original transaction is copied to the mutant, so the transaction time and "from" account of the mutant are reported correctly.
2014-02-14Merge pull request #3669 from gavinandresen/dead_txnsGavin Andresen
Handle "conflicted" transactions properly
2014-02-14qt: GUI for conflicted transactionsWladimir J. van der Laan
- Exclamation mark icon for conflicted transactions - Show mouseover status for conflicted transactions as "conflicted" - Don't show inactive transactions on overview page overview
2014-02-14Add -zapwallettxes cli/config option, used for wallet recoveryJeff Garzik
This diagnostic tool removes all "tx" records from the wallet db, then forces a full rescan, to rebuild "tx" records accurately.
2014-02-14Handle "conflicted" transactions properlyGavin Andresen
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-13Merge pull request #3662Wladimir J. van der Laan
0542619 Rename IsConfirmed to IsTrusted to better match the intended behavior. (Gregory Maxwell)
2014-02-13Add raw transaction hex to `gettransaction` wallet RPCWladimir J. van der Laan
This allows getting raw transaction data from the wallet even if the transaction is no longer in the blockchain / mempool (for example if it got orphaned due to malleability abuse).
2014-02-12Rename IsConfirmed to IsTrusted to better match the intended behavior.Gregory Maxwell
This doesn't change the functionality at all.
2014-02-12If requested, actually treat uncomfirmed change as being uncomfirmedb6393ce9-d324-4fe1-996b-acf82dbc3d53
This commit strengthens 1bbca249b202c4802cc2c4d4de4a26e6392b4d92 by updating the CWalletTx::IsConfirmed() function. If (bSpendZeroConfChange==false), then IsConfirmed() should actually treat unconfirmed change as being unconfirmed.
2014-02-11Merge pull request #3651Wladimir J. van der Laan
1bbca24 Add option to avoid spending unconfirmed change (Wladimir J. van der Laan)
2014-02-11Add HasCanonicalPushes(), and use it in IsStandardTxPieter Wuille
2014-02-11Move IsPushOnly() to script.cppPieter Wuille
2014-02-11Add option to avoid spending unconfirmed changeWladimir J. van der Laan
2014-02-09Merge pull request #3638Wladimir J. van der Laan
cdb6c16 remove setting methods in wallet/walletdb (Cozz Lovan) 44eb59e [Qt] remove broken OptionsModel::Upgrade() (Cozz Lovan)
2014-02-09Merge pull request #3606Wladimir J. van der Laan
6943cb9 small changes to rpc command help message strings (Philip Kaufmann)
2014-02-08Merge pull request #3609 from sipa/limitorphanblocksGavin Andresen
Limit the number of orphan blocks in memory
2014-02-07remove setting methods in wallet/walletdbCozz Lovan
2014-02-07[Qt] remove broken OptionsModel::Upgrade()Cozz Lovan
2014-02-02[Qt] Fix nTransactionFee in qt-settingsCozz Lovan
2014-01-31Limit the number of orphan blocksPieter Wuille
In case the total number of orphan blocks in memory exceeds a limit (currently set to 750), a random orphan block (which is not depended on by another orphan block) is dropped. This means it will need to be downloaded again, but it won't consume memory until then.
2014-01-30Merge pull request #3592Wladimir J. van der Laan
c117d9e Support for error messages and a few more rejection reasons (Luke Dashjr) 14e7ffc Use standard BIP 22 rejection reasons where applicable (Luke Dashjr)
2014-01-30small changes to rpc command help message stringsPhilip Kaufmann
2014-01-30Merge pull request #3601Wladimir J. van der Laan
c32a486 Add more data-driven tests. (Matt Corallo)
2014-01-30Final bitcoin_en update before 0.9.0rc1Wladimir J. van der Laan
Just for completeness. Only a few messages changed or moved since last time. Don't change any translatable messages until 0.9 final unless really necessary.
2014-01-30Add more data-driven tests.Matt Corallo
2014-01-30Merge pull request #3588Wladimir J. van der Laan
df966d1 log parameter interactions to debug.log (Philip Kaufmann)
2014-01-29Merge pull request #3370 from sipa/headersfirst3Gavin Andresen
Prepare block connection logic for headers-first
2014-01-29Support for error messages and a few more rejection reasonsLuke Dashjr
2014-01-29Use standard BIP 22 rejection reasons where applicableLuke Dashjr
2014-01-29Re-add BTC/KB in help message for `settxfee`Wladimir J. van der Laan
Commit a22eed6a got reverted in a RPC documentation update, redo it.
2014-01-29qt: Add closing newline to help messageWladimir J. van der Laan
`bitcoin-qt --help` was missing a final newline.
2014-01-29Bump version numbers for 0.9.0rc1 releaseWladimir J. van der Laan
2014-01-29qt: Fix Windows/Darwin executable metadataWladimir J. van der Laan
.rc's should be linked into the executable directly, not through a helper library.
2014-01-29qt: Transifex pull before 0.9.0rc1Wladimir J. van der Laan
2014-01-29Fix `getaddednodeinfo` RPC call with dns=falseWladimir J. van der Laan
The getaddednodeinfo RPC call, when invoked with the dns flag set to false, returns a malformed JSON object with duplicate keys. Change this to return an array of objects with one key as shown in the help message. Fixes #3581.
2014-01-29qt: Fix tab order in send and receive tabWladimir J. van der Laan
2014-01-29[Qt] minor receive tab improvementsCozz Lovan
2014-01-29Merge pull request #3597Wladimir J. van der Laan
3cf1f43 Mention `*` value for account in documentation for `getbalance` RPC (Wladimir J. van der Laan)
2014-01-29[Qt] extend validate line edit and btc address validatorPhilip Kaufmann
- remove btc address length from address validator - add an optional btc address check in validated line edit that defaults to off and is used in GUIUtil::setupAddressWidget() - an isAcceptable() check is added to validated line edit on focus out which only kicks in, when a validator is used with that widget - remove an isAcceptable() check from sendcoinsentry.cpp - remove obsolete attributes from ui files, which are set by calling GUIUtil::setupAddressWidget() - move some more things to GUIUtil::setupAddressWidget() and remove them from normal code e.g. placeholder text
2014-01-29Mention `*` value for account in documentation for `getbalance` RPCWladimir J. van der Laan
2014-01-29Merge pull request #3450Wladimir J. van der Laan
4c0b2cd Win32: use a more modern API call in FileCommit() (Philip Kaufmann)
2014-01-29Re-add newline to error() messagesWladimir J. van der Laan
As reported by @Subo1978, error messages don't have a trailing newline anymore after commit b77dfdc9. Add back this newline.
2014-01-29Merge pull request #3582Wladimir J. van der Laan
e5aadb2 Updated fallback seed nodes from sipa's DNS seeds (Gavin Andresen)
2014-01-28Merge pull request #3593Wladimir J. van der Laan
c7f9332 Add check for valid keys in `importprivkey` (Wladimir J. van der Laan)
2014-01-28Merge pull request #3590Wladimir J. van der Laan
edd735d [Qt] Fix coin control labels update (Cozz Lovan)
2014-01-28Merge pull request #3594Wladimir J. van der Laan
d7aa1ec [Qt] fix bitcoin: URI strings (spelling fixes) (Philip Kaufmann)
2014-01-28[Qt] fix bitcoin: URI strings (spelling fixes)Philip Kaufmann