highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-22 21:50:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,885 Commits 9 Branches 352 Tags
3a9dfe9d14bd8159a3b3dd66533c1b730c2158ea
Commit Graph

6693 Commits

Author SHA1 Message Date
paveljanik
3a9dfe9d14 Fix typo, wrong information in gettxout help text. 2016-01-10 17:33:54 +01:00
Wladimir J. van der Laan
dd1304ec21 Merge pull request #7081 
45b8e27 -bytespersigop option to additionally limit sigops in transactions we relay and mine (Luke Dashjr)
 2016-01-09 18:01:54 +01:00
Luke Dashjr
fdc202f4b0 Merge branch bytespersigop 2016-01-09 16:53:12 +00:00
Wladimir J. van der Laan
9de541a9c9 Merge pull request #7306 
f61766b Make sure conflicted wallet tx's update balances (Alex Morcos)
 2016-01-08 17:36:19 +01:00
Jonas Schnelli
8a7f0001be [RPC] remove the option of having multiple timer interfaces 2016-01-08 11:18:28 +01:00
Jonas Schnelli
db198d51a6 Fix RPCTimerInterface ordering issue 
Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads.
 2016-01-08 11:15:00 +01:00
Jonas Schnelli
b1cf0058d9 Merge pull request #7298 
faf3299 [qt] Intro: Display required space (MarcoFalke)
 2016-01-07 13:21:54 +01:00
Wladimir J. van der Laan
7b0a9a8040 Merge pull request #7266 
6cd198f Removed comment about IsStandard for P2SH scripts (Marcel Krüger)
 2016-01-07 11:58:37 +01:00
Wladimir J. van der Laan
5541560938 Merge pull request #7293 
faf538b [trivial] Merge test cases and replace CENT with COIN (MarcoFalke)
fa3c7e6 [wallet] Add regression test for vValue sort order (MarcoFalke)
 2016-01-07 09:24:34 +01:00
Wladimir J. van der Laan
d964b5bb1a Merge pull request #7229 
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)
 2016-01-07 09:17:11 +01:00
Wladimir J. van der Laan
de9e5ea75e Merge pull request #7257 
5e10922 Combine common error strings for different options so translations can be shared and reused (Luke Dashjr)
 2016-01-07 09:12:20 +01:00
Alex Morcos
f61766b37b Make sure conflicted wallet tx's update balances 2016-01-06 17:24:30 -05:00
Cory Fields
57d2f62c99 c++11: CAccountingEntry must be defined before use in a list 
c++11ism. This fixes builds against libc++.
 2016-01-05 17:17:29 -05:00
Cory Fields
89f71c68c0 c++11: don't throw from the reverselock destructor 
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.
 2016-01-05 17:17:29 -05:00
Cory Fields
76ac35f36d c++11: detect and correct for boost builds with an incompatible abi 
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.
 2016-01-05 17:17:29 -05:00
MarcoFalke
faf538bfdb [trivial] Merge test cases and replace CENT with COIN 2016-01-05 20:36:03 +01:00
MarcoFalke
faf3299b73 [qt] Intro: Display required space 
Required space depends on the user's choice:
 -prune=0
 -prune=<n>
 2016-01-05 19:22:47 +01:00
Wladimir J. van der Laan
605c17844e Merge pull request #7205 
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)
 2016-01-05 14:11:40 +01:00
Jonas Schnelli
aa413687de Merge pull request #7282 
621bd69 [Qt] fix coincontrol update issue when deleting a send coin entry (Jonas Schnelli)
 2016-01-05 13:02:00 +01:00
Wladimir J. van der Laan
2078495d9c Merge pull request #7193 
fafd093 [wallet] Adjust pruning test (MarcoFalke)
 2016-01-05 12:55:00 +01:00
Wladimir J. van der Laan
a10a7920c3 Merge pull request #7217 
5246180 Mark blocks with too many sigops as failed (Suhas Daftuar)
 2016-01-05 12:04:53 +01:00
MarcoFalke
fa3c7e644f [wallet] Add regression test for vValue sort order 2016-01-05 00:40:20 +01:00
Wladimir J. van der Laan
ac982a16e0 Merge pull request #7263 
a5a0831 Double semicolon cleanup. (21E14)
 2016-01-04 10:17:09 +01:00
Wladimir J. van der Laan
136abda597 qt: periodic translations pull from transifex 2016-01-04 09:48:44 +01:00
Jonas Schnelli
621bd6919f [Qt] fix coincontrol update issue when deleting a send coin entry 2016-01-04 09:44:36 +01:00
Jonas Schnelli
e289807e5a Merge pull request #7255 
6fd0a07 Remove hardcoded fee from CoinControl ToolTip (fanquake)
5fdf32d Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)
 2016-01-04 09:23:38 +01:00
Wladimir J. van der Laan
08ab9069af Merge pull request #7256 
33877ed Add note to CoinControl Dialog workaround (fanquake)
 2016-01-04 09:21:35 +01:00
Pieter Wuille
7ef8f3c072 Report non-mandatory script failures correctly 2016-01-03 16:50:31 +01:00
fanquake
6fd0a079d8 Remove hardcoded fee from CoinControl ToolTip 2016-01-03 05:57:51 +08:00
fanquake
33877ed3b8 Add note to CoinControl Dialog workaround 2016-01-02 17:35:33 +08:00
Marcel Krüger
6cd198f380 Removed comment about IsStandard for P2SH scripts 
Since #4365 (6259937388) P2SH scripts do not have to be IsStandard scripts.
 2015-12-30 21:53:40 +01:00
21E14
a5a0831458 Double semicolon cleanup. 2015-12-30 12:23:07 -05:00
Luke Dashjr
5e109225ae Combine common error strings for different options so translations can be shared and reused 2015-12-26 08:04:03 +00:00
fanquake
5fdf32de7e Replace some instances of formatWithUnit with formatHtmlWithUnit 
Strings in a HTML context should be using formatHtmlWithUnit.
 2015-12-26 11:49:19 +08:00
Jonas Schnelli
be9a9a3d22 Merge pull request #7214 
fa2f4bc qt5: Use the fixed font the system recommends (MarcoFalke)
 2015-12-23 10:13:00 +01:00
Jonas Schnelli
a1c185be54 Merge pull request #7218 
fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)
 2015-12-22 14:05:39 +01:00
Wladimir J. van der Laan
595f93977c Merge pull request #7213 
37d271d Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
 2015-12-22 11:37:11 +01:00
Wladimir J. van der Laan
c24337964f Merge pull request #7062 
901b01d Remove GetMinRelayFee (Suhas Daftuar)
27fae34 Use fee deltas for determining mempool acceptance (Suhas Daftuar)
9ef2a25 Update replace-by-fee logic to use fee deltas (Suhas Daftuar)
eb30666 Fix mempool limiting for PrioritiseTransaction (Suhas Daftuar)
 2015-12-21 17:14:13 +01:00
MarcoFalke
fa33d9740c [walletdb] Add missing LOCK() in Recover() for dummyWallet 2015-12-19 14:26:46 +01:00
MarcoFalke
fa5769e95a [qt] Fix misleading translation 2015-12-16 15:44:46 +01:00
MarcoFalke
fa8c8d7fa6 torcontrol debug: Change to a blanket message that covers both cases 2015-12-16 12:57:06 +01:00
Suhas Daftuar
5246180f16 Mark blocks with too many sigops as failed 2015-12-15 15:40:50 -05:00
Elias Rohrer
e18378e53f Removed offline testnet DNSSeed 'alexykot.me'. 2015-12-15 14:53:15 +01:00
mb300sd
37d271d7cc Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. 2015-12-15 02:01:45 -05:00
MarcoFalke
fa2f4bc4eb qt5: Use the fixed font the system recommends 2015-12-14 21:39:18 +01:00
Wladimir J. van der Laan
7a5040155e Merge pull request #7125 
5400ef6 Replace trickle nodes with per-node/message Poisson delays (Pieter Wuille)
 2015-12-14 13:42:02 +01:00
Wladimir J. van der Laan
dc511dcfd9 Merge pull request #7200 
d812daf fix logic for error log (accraze)
c611acc wallet: check if tx scriptPubKey is unspendable (accraze)
b6915b8 checks for null data transaction before debug.log (accraze)
 2015-12-14 13:08:35 +01:00
Matt Corallo
daf6466330 Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4] 2015-12-13 16:21:48 -08:00
MarcoFalke
fa24439ff3 Bump copyright headers to 2015 2015-12-13 18:08:39 +01:00
accraze
d812daf967 fix logic for error log 2015-12-12 10:45:53 -08:00