aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-17Merge pull request #3690 from laanwj/2014_02_gettransaction_serialize_only_txGavin Andresen
Serialize only CTransaction data in gettransaction RPC hex
2014-02-17Merge pull request #3587Wladimir J. van der Laan
ceb8e22 [Qt] allow translation of client bitness (Philip Kaufmann)
2014-02-17Merge pull request #3666Wladimir J. van der Laan
bbfce8a fix non-standard reason string in main.cpp (Philip Kaufmann)
2014-02-17Merge pull request #3614Wladimir J. van der Laan
b920148 [Qt] Improve single step in bitcoinamountfield (Cozz Lovan)
2014-02-17Merge pull request #3643Wladimir J. van der Laan
d54e819 Log warnings when bootstrap files are specified but cannot be opened (Wladimir J. van der Laan)
2014-02-17Merge pull request #3649Wladimir J. van der Laan
3078b58 linearize.py: Harmonize rpcpass to rpcpassword (Subo1978)
2014-02-17Merge pull request #3688Wladimir J. van der Laan
7f1b6a6 remove orphan fHaveGUI from main.h (Philip Kaufmann)
2014-02-17Serialize only CTransaction data in gettransaction RPC hexWladimir J. van der Laan
Don't include trailing implementation-specific wallet metadata. Fixes 3a1c20b.
2014-02-16remove orphan fHaveGUI from main.hPhilip Kaufmann
2014-02-16Merge pull request #3646Wladimir J. van der Laan
5770254 Copyright header updates s/2013/2014 on files whose last git commit was done in 2014. contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does. (gubatron)
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-16[Qt] allow translation of client bitnessPhilip Kaufmann
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-14Merge pull request #3659 from jgarzik/zapallJeff Garzik
Add -zapwallettx function, a diagnostic tool to assist in wallet repair
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-14Merge pull request #3667 from gavinandresen/rpctest_osxcompatGavin Andresen
Make qa/rpc-tests/ compatible with OSX
2014-02-13Make qa/rpc-tests/ compatible with OSXGavin Andresen
Reworked send.sh, so it works properly on my Mac (killall send.sh doesn't work, because the process name is 'bash' not 'send.sh'). So now send.sh writes a .send.pid file, and invoking it as send.sh -STOP (as the bitcoind -walletnotify) signals that PID.
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-13Merge pull request #3668Wladimir J. van der Laan
3a1c20b Add raw transaction hex to `gettransaction` wallet RPC (Wladimir J. van der Laan)
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-13Make qa/rpc-tests/ compatible with OSXGavin Andresen
Reworked send.sh, so it works properly on my Mac (killall send.sh doesn't work, because the process name is 'bash' not 'send.sh'). So now send.sh writes a .send.pid file, and invoking it as send.sh -STOP (as the bitcoind -walletnotify) signals that PID.
2014-02-13fix non-standard reason string in main.cppPhilip Kaufmann
2014-02-13Merge pull request #3657Wladimir J. van der Laan
fdbc2b1 If requested, actually treat uncomfirmed change as being uncomfirmed (b6393ce9-d324-4fe1-996b-acf82dbc3d53)
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-11Merge pull request #3025 from sipa/noncanpushGregory Maxwell
Make signatures with non-canonical data pushes non-standard.
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-10Merge pull request #3622Wladimir J. van der Laan
c13a13e gitian: add -D flag to ar for deterministic output for linux deps (Wladimir J. van der Laan) 1552145 gitian: Sort generated source distribution archive (Wladimir J. van der Laan) aabcd11 gitian: Make linux boost dependency completely deterministic (Wladimir J. van der Laan) aa93485 gitian: Make linux build of OpenSSL deterministic (Wladimir J. van der Laan)
2014-02-10Merge pull request #3625Wladimir J. van der Laan
4ce9106 gitian: sort generated source distribution archive for windows (Wladimir J. van der Laan) 6b55e6b gitian: Post-process .a libraries for win to be deterministic (Wladimir J. van der Laan) c43d1e5 gitian: Make windows dependencies outputs fully deterministic (Wladimir J. van der Laan)
2014-02-10gitian: sort generated source distribution archive for windowsWladimir J. van der Laan
Make the bitcoin-X.X.X.tar.gz deterministic.
2014-02-10gitian: Post-process .a libraries for win to be deterministicWladimir J. van der Laan
2014-02-10gitian: add -D flag to ar for deterministic output for linux depsWladimir J. van der Laan
ar -D: Operate in deterministic mode. When adding files and the archive index use zero for UIDs, GIDs, timestamps, and use consistent file modes for all files. When this option is used, if ar is used with identical options and identical input files, multiple runs will create identical output files regardless of the input files' owners, groups, file modes, or modification times.
2014-02-10linearize.py: Harmonize rpcpass to rpcpasswordSubo1978
linearize.py: harmonize rpcpass to rpcpassword according settings in bitcoin.conf
2014-02-10gitian: Sort generated source distribution archiveWladimir J. van der Laan
Sort the filenames in the resulting tar, normalize the time/date and user/group information.
2014-02-09Copyright header updates s/2013/2014 on files whose last git commit was done ↵gubatron
in 2014. contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does.
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-09Log warnings when bootstrap files are specified but cannot be openedWladimir J. van der Laan
- Log a warning when bootstrap files are specified using `-loadblock` but cannot be opened. - Log a warning when bootstrap.dat exists in the home directory but cannot be opened.
2014-02-09doc: add gist link to 'reject' P2P message mention in release notesWladimir J. van der Laan
2014-02-08Merge pull request #3644 from sipa/cleannotesWladimir J. van der Laan
Correct/add/merge a few release notes entries
2014-02-08Correct/add/merge a few release notes entriesPieter Wuille
2014-02-08Merge pull request #3609 from sipa/limitorphanblocksGavin Andresen
Limit the number of orphan blocks in memory