aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-22Don't use PRIx64 formatting derives from inttypes.hWladimir J. van der Laan
As the tinyformat-based formatting system (introduced in b77dfdc) is type-safe, no special format characters are needed to specify sizes. Tinyformat can support (ignore) the C99 prefixes such as "ll" but chokes on MSVC's inttypes.h defines prefixes such as "I64X". So don't include inttypes.h and define our own for compatibility. (an alternative would be to sweep the entire codebase using sed -i to get rid of the size specifiers but this has less diff impact)
2014-02-22Merge pull request #3720Wladimir J. van der Laan
b96f6a7 Remove "conflicted" as transaction category. (Wladimir J. van der Laan)
2014-02-21Remove "conflicted" as transaction category.Wladimir J. van der Laan
We were losing information about sent/received by overriding the category in case of a conflicted transaction. Hence, remove the "conflicted" category. Conflicted status of a transaction can still be determined by looking for confirmations<0.
2014-02-20Merge pull request #2910Wladimir J. van der Laan
d8b4b49 Don't store or send side-chain blocks lower than last checkpoint. (Ashley Holman)
2014-02-19Merge pull request #3703Wladimir J. van der Laan
ad54a9b Change new constants in txdb.h to int64_t (Wladimir J. van der Laan)
2014-02-19Merge pull request #3699Wladimir J. van der Laan
ddcabae qt: Rename 'Confirmed' balance to 'Spendable' on overview page (Wladimir J. van der Laan)
2014-02-19qt: Rename 'Confirmed' balance to 'Spendable' on overview pageWladimir J. van der Laan
The word 'Spendable' more precisely says what the balance actually means. Avoids the confirmed/unconfirmed confusion that can be caused by #3676.
2014-02-18Change new constants in txdb.h to int64_tWladimir J. van der Laan
A shift overflow was happening when using these to check against in init.cpp. Fixes #3702.
2014-02-18Merge pull request #3693Wladimir J. van der Laan
f05fa03 [Qt] small .ui cleanup for optionsdialog and coincontrol (Philip Kaufmann)
2014-02-18Merge pull request #3687Wladimir J. van der Laan
82e9600 add constants for shared (GUI/core) -dbcache settings (Philip Kaufmann) 879b390 Increase default dbcache to 100 MiB (Pieter Wuille)
2014-02-17Merge pull request #3691Wladimir J. van der Laan
a143d4c Fix crash in importwallet and dumpwallet formatting (Wladimir J. van der Laan)
2014-02-17Fix crash in importwallet and dumpwallet formattingWladimir J. van der Laan
- DecodeDumpTime was passing a statically allocated facet object to std::locale. However, "The constructed locale object takes over responsibility for deleting this facet object." causing a free() crash on scope exit. Fixes #3670. - EncodeDumpTime was using the wrong format character for dates (appears accidentally introduced in 51ed9ec9)
2014-02-17Merge pull request #3679 from laanwj/2014_02_walletpassphrase_behaviorGavin Andresen
Document new `walletpassphrase` behavior in 0.9
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-17[Qt] small .ui cleanup for optionsdialog and coincontrolPhilip Kaufmann
2014-02-17add constants for shared (GUI/core) -dbcache settingsPhilip Kaufmann
- adds nDefaultDbCache, nMaxDbCache and nMinDbCache in txdb.h
2014-02-17Increase default dbcache to 100 MiBPieter Wuille
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-16Document new `walletpassphrase` behavior in 0.9Wladimir J. van der Laan
Also add a note to the release notes. Fixes #3672.
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
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-13 08:03:40 +0000