aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update license year range to 2016Prayag Verma2016-01-171-1/+1
|
* Merge pull request #7334Wladimir J. van der Laan2016-01-141-4/+2
|\ | | | | | | fa989fb [qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (MarcoFalke)
| * [qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5)MarcoFalke2016-01-131-4/+2
| |
* | Merge pull request #7327Jonas Schnelli2016-01-131-1/+1
|\ \ | |/ |/| | | 30cdace [Wallet] Transaction View: LastMonth calculation fixed (crowning-)
| * [Wallet] Transaction View: LastMonth calculation fixedcrowning-2016-01-131-1/+1
| |
* | Merge pull request #7332Wladimir J. van der Laan2016-01-132-8/+7
|\ \ | | | | | | | | | faf671b [wallet] Clarify rpc help message with regard to rounding (MarcoFalke)
| * | [wallet] Clarify rpc help message with regard to roundingMarcoFalke2016-01-132-8/+7
| | |
* | | Merge pull request #7312Wladimir J. van der Laan2016-01-135-17/+131
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d11fc16 [Wallet] Call notification signal when a transaction is abandoned (Jonas Schnelli) df0e222 Add RPC test for abandoned and conflicted transactions. (Alex Morcos) 01e06d1 Add new rpc call: abandontransaction (Alex Morcos) 9e69717 Make wallet descendant searching more efficient (Alex Morcos)
| * | | [Wallet] Call notification signal when a transaction is abandonedJonas Schnelli2016-01-131-0/+1
| | | |
| * | | Add new rpc call: abandontransactionAlex Morcos2016-01-135-12/+125
| | | | | | | | | | | | | | | | Unconfirmed transactions that are not in your mempool either due to eviction or other means may be unlikely to be mined. abandontransaction gives the wallet a way to no longer consider as spent the coins that are inputs to such a transaction. All dependent transactions in the wallet will also be marked as abandoned.
| * | | Make wallet descendant searching more efficientAlex Morcos2016-01-071-5/+5
| | | |
* | | | Merge pull request #7326Wladimir J. van der Laan2016-01-131-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | 3a9dfe9 Fix typo, wrong information in gettxout help text. (paveljanik)
| * | | | Fix typo, wrong information in gettxout help text.paveljanik2016-01-101-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #7296Wladimir J. van der Laan2016-01-134-10/+30
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | bebe58b SQUASHME: Fix rpc tests that assumed fallback to minRelayTxFee (Alex Morcos) e420a1b Add sane fallback for fee estimation (Alex Morcos) 995b9f3 Always respect GetRequiredFee for wallet txs (Alex Morcos)
| * | | Add sane fallback for fee estimationAlex Morcos2016-01-054-2/+27
| | | | | | | | | | | | | | | | Add new commandline option "-fallbackfee" to use when fee estimation does not have sufficient data.
| * | | Always respect GetRequiredFee for wallet txsAlex Morcos2016-01-051-8/+3
| | | |
* | | | Merge pull request #7081Wladimir J. van der Laan2016-01-093-8/+14
|\ \ \ \ | | | | | | | | | | | | | | | 45b8e27 -bytespersigop option to additionally limit sigops in transactions we relay and mine (Luke Dashjr)
| * \ \ \ Merge branch bytespersigopLuke Dashjr2016-01-093-8/+14
| |\ \ \ \
| | * | | | -bytespersigop option to additionally limit sigops in transactions we relay ↵Luke Dashjr2015-12-013-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | and mine
* | | | | | Merge pull request #7306Wladimir J. van der Laan2016-01-081-0/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | f61766b Make sure conflicted wallet tx's update balances (Alex Morcos)
| * | | | | Make sure conflicted wallet tx's update balancesAlex Morcos2016-01-061-0/+7
| | |_|/ / | |/| | |
* | | | | [RPC] remove the option of having multiple timer interfacesJonas Schnelli2016-01-084-17/+25
| | | | |
* | | | | Fix RPCTimerInterface ordering issueJonas Schnelli2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads.
* | | | | Merge pull request #7298Jonas Schnelli2016-01-071-5/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | faf3299 [qt] Intro: Display required space (MarcoFalke)
| * | | | | [qt] Intro: Display required spaceMarcoFalke2016-01-051-5/+15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Required space depends on the user's choice: -prune=0 -prune=<n>
* | | | | Merge pull request #7266Wladimir J. van der Laan2016-01-071-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 6cd198f Removed comment about IsStandard for P2SH scripts (Marcel Krüger)
| * | | | | Removed comment about IsStandard for P2SH scriptsMarcel Krüger2015-12-301-3/+0
| | | | | | | | | | | | | | | | | | Since #4365 (62599373883a66a958136f48ab0e2b826e3d5bf8) P2SH scripts do not have to be IsStandard scripts.
* | | | | | Merge pull request #7293Wladimir J. van der Laan2016-01-071-6/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | faf538b [trivial] Merge test cases and replace CENT with COIN (MarcoFalke) fa3c7e6 [wallet] Add regression test for vValue sort order (MarcoFalke)
| * | | | | | [trivial] Merge test cases and replace CENT with COINMarcoFalke2016-01-051-15/+10
| | | | | | |
| * | | | | | [wallet] Add regression test for vValue sort orderMarcoFalke2016-01-051-0/+18
| | | | | | |
* | | | | | | Merge pull request #7229Wladimir J. van der Laan2016-01-071-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa33d97 [walletdb] Add missing LOCK() in Recover() for dummyWallet (MarcoFalke) fa14d99 [qa] check if wallet or blochchain maintenance changes the balance (MarcoFalke) fa0765d [qa] Cleanup wallet.py test (MarcoFalke)
| * | | | | | | [walletdb] Add missing LOCK() in Recover() for dummyWalletMarcoFalke2015-12-191-1/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #7257Wladimir J. van der Laan2016-01-071-7/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5e10922 Combine common error strings for different options so translations can be shared and reused (Luke Dashjr)
| * | | | | | | Combine common error strings for different options so translations can be ↵Luke Dashjr2015-12-261-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared and reused
* | | | | | | | c++11: CAccountingEntry must be defined before use in a listCory Fields2016-01-051-84/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c++11ism. This fixes builds against libc++.
* | | | | | | | c++11: don't throw from the reverselock destructorCory Fields2016-01-052-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noexcept is default for destructors as of c++11. By throwing in reverselock's destructor if it's lock has been tampered with, the likely result is std::terminate being called. Indeed that happened before this change. Once reverselock has taken another lock (its ctor didn't throw), it makes no sense to try to grab or lock the parent lock. That is be broken/undefined behavior depending on the parent lock's implementation, but it shouldn't cause the reverselock to fail to re-lock when destroyed. To avoid those problems, simply swap the parent lock's contents with a dummy for the duration of the lock. That will ensure that any undefined behavior is caught at the call-site rather than the reverse lock's destruction. Barring a failed mutex unlock which would be indicative of a larger problem, the destructor should now never throw.
* | | | | | | | c++11: detect and correct for boost builds with an incompatible abiCory Fields2016-01-051-0/+6
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is ugly, but temporary. boost::filesystem will likely be dropped soon after c++11 is enabled. Otherwise, we could simply roll our own copy_file. I've fixed this at the buildsystem level for now in order to avoid mixing in functional changes. Explanation: If boost (prior to 1.57) was built without c++11, it emulated scoped enums using c++98 constructs. Unfortunately, this implementation detail leaked into the abi. This was fixed in 1.57. When building against that installed version using c++11, the headers pick up on the native c++11 scoped enum support and enable it, however it will fail to link. This can be worked around by disabling c++11 scoped enums if linking will fail. Add an autoconf test to determine incompatibility. At build-time, if native enums are being used (a c++11 build), and force-disabling them causes a successful link, we can be sure that there's an incompatibility and enable the work-around.
* | | | | | | Merge pull request #7205Wladimir J. van der Laan2016-01-05253-253/+253
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa71669 [devtools] Use git pretty-format for year parsing (MarcoFalke) fa24439 Bump copyright headers to 2015 (MarcoFalke) fa6ad85 [devtools] Rewrite fix-copyright-headers.py (MarcoFalke)
| * | | | | | | Bump copyright headers to 2015MarcoFalke2015-12-13253-253/+253
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7282Jonas Schnelli2016-01-051-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 621bd69 [Qt] fix coincontrol update issue when deleting a send coin entry (Jonas Schnelli)
| * | | | | | | [Qt] fix coincontrol update issue when deleting a send coin entryJonas Schnelli2016-01-041-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #7193Wladimir J. van der Laan2016-01-051-8/+10
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | fafd093 [wallet] Adjust pruning test (MarcoFalke)
| * | | | | | | [wallet] Adjust pruning testMarcoFalke2015-12-091-8/+10
| | | | | | | |
* | | | | | | | Merge pull request #7217Wladimir J. van der Laan2016-01-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 5246180 Mark blocks with too many sigops as failed (Suhas Daftuar)
| * | | | | | | | Mark blocks with too many sigops as failedSuhas Daftuar2015-12-151-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #7263Wladimir J. van der Laan2016-01-046-9/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5a0831 Double semicolon cleanup. (21E14)
| * | | | | | | | | Double semicolon cleanup.21E142015-12-306-9/+9
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | qt: periodic translations pull from transifexWladimir J. van der Laan2016-01-0475-237/+5302
| | | | | | | | |
* | | | | | | | | Merge pull request #7255Jonas Schnelli2016-01-044-12/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fd0a07 Remove hardcoded fee from CoinControl ToolTip (fanquake) 5fdf32d Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)
| * | | | | | | | | Remove hardcoded fee from CoinControl ToolTipfanquake2016-01-031-2/+2
| | | | | | | | | |