aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #3676Wladimir J. van der Laan2014-02-164-47/+101
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | 29d4507 qt: Add option to (not) spend unconfirmed change (Wladimir J. van der Laan)
| * | | | | | | | qt: Add option to (not) spend unconfirmed changeWladimir J. van der Laan2014-02-164-47/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a wallet tab to options dialog - Move fee setting to wallet tab - Add new setting to set -nospendzeroconfchange from UI
* | | | | | | | | Merge pull request #3671 from gavinandresen/txn_conflictsGavin Andresen2014-02-154-6/+121
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Report transaction conflicts, and tentative account balance fix
| * | | | | | | | Track and report wallet transaction clonesGavin Andresen2014-02-144-6/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge pull request #3669 from gavinandresen/dead_txnsGavin Andresen2014-02-1417-17/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Handle "conflicted" transactions properly
| * | | | | | | | qt: GUI for conflicted transactionsWladimir J. van der Laan2014-02-1410-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Exclamation mark icon for conflicted transactions - Show mouseover status for conflicted transactions as "conflicted" - Don't show inactive transactions on overview page overview
| * | | | | | | | Handle "conflicted" transactions properlyGavin Andresen2014-02-147-11/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Add -zapwallettxes cli/config option, used for wallet recoveryJeff Garzik2014-02-145-0/+128
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This diagnostic tool removes all "tx" records from the wallet db, then forces a full rescan, to rebuild "tx" records accurately.
* | | | | | | | Merge pull request #3662Wladimir J. van der Laan2014-02-134-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 0542619 Rename IsConfirmed to IsTrusted to better match the intended behavior. (Gregory Maxwell)
| * | | | | | | | Rename IsConfirmed to IsTrusted to better match the intended behavior.Gregory Maxwell2014-02-124-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't change the functionality at all.
* | | | | | | | | Add raw transaction hex to `gettransaction` wallet RPCWladimir J. van der Laan2014-02-131-1/+7
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | | If requested, actually treat uncomfirmed change as being uncomfirmedb6393ce9-d324-4fe1-996b-acf82dbc3d532014-02-121-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit strengthens 1bbca249b202c4802cc2c4d4de4a26e6392b4d92 by updating the CWalletTx::IsConfirmed() function. If (bSpendZeroConfChange==false), then IsConfirmed() should actually treat unconfirmed change as being unconfirmed.
* | | | | | | Merge pull request #3651Wladimir J. van der Laan2014-02-113-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1bbca24 Add option to avoid spending unconfirmed change (Wladimir J. van der Laan)
| * | | | | | | Add option to avoid spending unconfirmed changeWladimir J. van der Laan2014-02-113-1/+5
| | | | | | | |
* | | | | | | | Add HasCanonicalPushes(), and use it in IsStandardTxPieter Wuille2014-02-114-1/+53
| | | | | | | |
* | | | | | | | Move IsPushOnly() to script.cppPieter Wuille2014-02-112-17/+19
|/ / / / / / /
* | | | | | | Merge pull request #3638Wladimir J. van der Laan2014-02-096-110/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdb6c16 remove setting methods in wallet/walletdb (Cozz Lovan) 44eb59e [Qt] remove broken OptionsModel::Upgrade() (Cozz Lovan)
| * | | | | | | remove setting methods in wallet/walletdbCozz Lovan2014-02-073-41/+0
| | | | | | | |
| * | | | | | | [Qt] remove broken OptionsModel::Upgrade()Cozz Lovan2014-02-073-69/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3606Wladimir J. van der Laan2014-02-093-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | 6943cb9 small changes to rpc command help message strings (Philip Kaufmann)
| * | | | | | small changes to rpc command help message stringsPhilip Kaufmann2014-01-303-5/+5
| | | | | | |
* | | | | | | Merge pull request #3609 from sipa/limitorphanblocksGavin Andresen2014-02-082-1/+29
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Limit the number of orphan blocks in memory
| * | | | | | Limit the number of orphan blocksPieter Wuille2014-01-312-1/+29
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* / | | | | [Qt] Fix nTransactionFee in qt-settingsCozz Lovan2014-02-021-0/+3
|/ / / / /
* | | | | Merge pull request #3592Wladimir J. van der Laan2014-01-302-45/+47
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | c117d9e Support for error messages and a few more rejection reasons (Luke Dashjr) 14e7ffc Use standard BIP 22 rejection reasons where applicable (Luke Dashjr)
| * | | | Support for error messages and a few more rejection reasonsLuke Dashjr2014-01-292-10/+12
| | | | |
| * | | | Use standard BIP 22 rejection reasons where applicableLuke Dashjr2014-01-291-35/+35
| | | | |
* | | | | Merge pull request #3601Wladimir J. van der Laan2014-01-302-2/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | c32a486 Add more data-driven tests. (Matt Corallo)
| * | | | | Add more data-driven tests.Matt Corallo2014-01-302-2/+34
| | | | | |
* | | | | | Final bitcoin_en update before 0.9.0rc1Wladimir J. van der Laan2014-01-301-68/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #3588Wladimir J. van der Laan2014-01-301-9/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | df966d1 log parameter interactions to debug.log (Philip Kaufmann)
| * | | | | | log parameter interactions to debug.logPhilip Kaufmann2014-01-271-9/+17
| | | | | | |
* | | | | | | Merge pull request #3370 from sipa/headersfirst3Gavin Andresen2014-01-293-229/+284
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prepare block connection logic for headers-first
| * | | | | | | Prepare block connection logic for headers-first.Pieter Wuille2014-01-273-204/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the block processing logic from "try to atomically switch to a new block" to a continuous "(dis)connect a block, aiming for the assumed best chain". This means the smallest atomic operations on the chainstate become individual block connections or disconnections, instead of entire reorganizations. It may mean that we try to reorganize to one block, fail, and rereorganize again to the old block. This is slower, but doesn't require unbounded RAM. It also means that a ConnectBlock which fails may be no longer called from the ProcessBlock which knows which node sent it. To deal with that, a mapBlockSource is kept, and invalid blocks cause asynchronous "reject" messages and banning (if necessary).
| * | | | | | | Move only: extract WriteChainState and UpdatedTip from SetBestChain.Pieter Wuille2014-01-271-60/+63
| |/ / / / / /
* | | | | | | Re-add BTC/KB in help message for `settxfee`Wladimir J. van der Laan2014-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a22eed6a got reverted in a RPC documentation update, redo it.
* | | | | | | qt: Add closing newline to help messageWladimir J. van der Laan2014-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `bitcoin-qt --help` was missing a final newline.
* | | | | | | Bump version numbers for 0.9.0rc1 releaseWladimir J. van der Laan2014-01-291-3/+3
| | | | | | |
* | | | | | | qt: Fix Windows/Darwin executable metadataWladimir J. van der Laan2014-01-291-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .rc's should be linked into the executable directly, not through a helper library.
* | | | | | | qt: Transifex pull before 0.9.0rc1Wladimir J. van der Laan2014-01-2960-22927/+49840
| | | | | | |
* | | | | | | Fix `getaddednodeinfo` RPC call with dns=falseWladimir J. van der Laan2014-01-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | qt: Fix tab order in send and receive tabWladimir J. van der Laan2014-01-293-5/+10
| | | | | | |
* | | | | | | [Qt] minor receive tab improvementsCozz Lovan2014-01-295-63/+193
| | | | | | |
* | | | | | | Merge pull request #3597Wladimir J. van der Laan2014-01-291-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3cf1f43 Mention `*` value for account in documentation for `getbalance` RPC (Wladimir J. van der Laan)
| * | | | | | | Mention `*` value for account in documentation for `getbalance` RPCWladimir J. van der Laan2014-01-291-1/+3
| | | | | | | |
* | | | | | | | [Qt] extend validate line edit and btc address validatorPhilip Kaufmann2014-01-2911-55/+140
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | Merge pull request #3450Wladimir J. van der Laan2014-01-291-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4c0b2cd Win32: use a more modern API call in FileCommit() (Philip Kaufmann)
| * | | | | | | Win32: use a more modern API call in FileCommit()Philip Kaufmann2013-12-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this seems to be a more recent API call and also supports e.g. SMB3, ReFS, which is not guaranteed for commit_() - link to MSDN: http://msdn.microsoft.com/en-us/library/windows/desktop/aa364439%28v=vs.85%29.aspx
* | | | | | | | Re-add newline to error() messagesWladimir J. van der Laan2014-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by @Subo1978, error messages don't have a trailing newline anymore after commit b77dfdc9. Add back this newline.
* | | | | | | | Merge pull request #3582Wladimir J. van der Laan2014-01-291-75/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | e5aadb2 Updated fallback seed nodes from sipa's DNS seeds (Gavin Andresen)