Commit Graph

12368 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
ef30389e2a
Merge pull request #6544
c5c1edf Fix spelling mistake in -> if. (Mark Friedenbach)
e846b2a Correct a possibly intentional pun that is nevertheless hard to read: "two times of nLockTime." What is meant is that there are two kinds, or categories of nLockTime. (Mark Friedenbach)
2015-08-19 17:37:52 +02:00
Wladimir J. van der Laan
80cddbbba9
Merge pull request #6539
9f68ed6 typofixes (found by misspell_fixer) (Veres Lajos)
2015-08-19 17:28:00 +02:00
Wladimir J. van der Laan
a6f2affde8
Merge pull request #6565
fb08d92 Make sure we re-acquire lock if a task throws (Casey Rodarmor)
2015-08-19 16:27:40 +02:00
Wladimir J. van der Laan
e08a7d9d40
Merge pull request #6561
7bd57bb Add limitedmap test (Casey Rodarmor)
8b06894 Disallow unlimited limited maps (Casey Rodarmor)
fd2d862 Make limited map actually respect max size (Casey Rodarmor)
2015-08-19 15:45:14 +02:00
Wladimir J. van der Laan
0f0f323c9a
Merge pull request #6567
2016576 Fix crash when mining with empty keypool. (Daniel Kraft)
2015-08-19 15:07:38 +02:00
Holger Schinzel
342522352d Merge pull request #552 from dashpay/master
merge back
2015-08-19 07:18:53 +02:00
Evan Duffield
e1306eb272 Merge branch 'v0.12.0.x' 2015-08-18 18:06:25 -07:00
Evan Duffield
ba1bc44737 version bump - v46 2015-08-18 18:06:13 -07:00
Evan Duffield
37ae8d36b1 Merge branch 'v0.12.0.x' 2015-08-18 18:04:04 -07:00
evan82
4f99745b92 Merge pull request #551 from UdjinM6/v0.12.0.x_disable_mncache
V0.12.0.x disable mncache
2015-08-18 13:52:51 -07:00
UdjinM6
f119afb43b it’s ok to be banned for dseg, you’ll just find another peers 2015-08-18 23:46:47 +03:00
evan82
7fb5f5881c Merge pull request #549 from UdjinM6/v0.12.0.x_msghand
V0.12.0.x msghand
2015-08-18 12:35:19 -07:00
pstratem
ade97928f7 replace absolute sleep with conditional wait 2015-08-18 21:07:30 +03:00
evan82
418a9eeb37 Merge pull request #547 from UdjinM6/v0.12.0.x_fix_sync_progressbar_text
V0.12.0.x fix sync progressbar text
2015-08-18 08:16:33 -07:00
Casey Rodarmor
fb08d92312 Make sure we re-acquire lock if a task throws 2015-08-18 10:40:13 -04:00
Daniel Kraft
2016576998 Fix crash when mining with empty keypool.
Since the introduction of the ScriptForMining callback, the mining
functions (setgenerate and generate) crash with an assertion failure
(due to a NULL pointer script returned) if the keypool is empty.  Fix
this by giving a proper error.
2015-08-18 09:07:33 +02:00
UdjinM6
0ecf85fea9 fix sync progressbar text 2015-08-18 06:01:17 +03:00
Evan Duffield
a7ec2deed9 Fix Masternode Payments rank calculation 2015-08-17 15:42:51 -07:00
Casey Rodarmor
7bd57bb1d7 Add limitedmap test 2015-08-17 12:15:32 -04:00
Casey Rodarmor
8b06894194 Disallow unlimited limited maps 2015-08-17 12:15:32 -04:00
Casey Rodarmor
fd2d862fbc Make limited map actually respect max size 2015-08-17 12:15:32 -04:00
Wladimir J. van der Laan
1e92b27540
Merge pull request #6553
183b8fb Add missing files to files.md (fanquake)
2015-08-17 17:06:24 +02:00
Wladimir J. van der Laan
39ddaeb8fe
Merge pull request #6551
243b80d Handle leveldb::DestroyDB() errors on wipe failure (Adam Weiss)
2015-08-17 16:52:57 +02:00
Wladimir J. van der Laan
bb4faee21e
Merge pull request #6509
45a6cce Fix race condition on test node shutdown (Casey Rodarmor)
2015-08-17 16:45:22 +02:00
UdjinM6
25e4c54a26 Merge pull request #546 from UdjinM6/v0.12.0.x
Update masternode-budget.md
2015-08-17 15:55:29 +03:00
UdjinM6
fc9118c253 Update masternode-budget.md 2015-08-17 15:51:12 +03:00
Evan Duffield
b2b2ceff52 Merge branch 'v0.12.0.x' 2015-08-15 19:47:22 -07:00
Evan Duffield
b0e718a6ca v0.12.0.45 2015-08-15 19:46:54 -07:00
evan82
59e594546c Merge pull request #538 from UdjinM6/v0.12.0.x_translations20150815
Chinese TW update
2015-08-15 19:42:35 -07:00
UdjinM6
cd819e5a40 chinese tw 2015-08-16 05:39:39 +03:00
evan82
8a24144222 Merge pull request #537 from UdjinM6/v0.12.0.x_fix_ds
V0.12.0.x fix ds
2015-08-15 18:29:41 -07:00
UdjinM6
a723c2148e fix DS bug - endless collateral creation until one of them confirms 2015-08-16 03:29:16 +03:00
UdjinM6
628d281209 refactor names and select logic for ONLY_ coins enum members 2015-08-16 03:26:20 +03:00
Holger Schinzel
cfbcc81a36 Merge pull request #536 from dashpay/master
merge master back to v12 branch
2015-08-16 00:44:30 +02:00
evan82
d1aed33d7a Merge pull request #534 from UdjinM6/v0.12.0.x_fix_rpc_masternode_status
fixes for masternrode rpc
2015-08-15 13:32:26 -07:00
evan82
6bd1d7d16e Merge pull request #532 from UdjinM6/v0.12.0.x_fix_GetSporkValue
fix GetSporkValue
2015-08-15 13:30:21 -07:00
evan82
0493f52c27 Merge pull request #531 from UdjinM6/v0.12.0.x_timeouts
Timeouts fixes
2015-08-15 13:29:39 -07:00
Jeff Garzik
6feeec1ec5
Merge pull request #6013 2015-08-15 16:09:06 -04:00
evan82
c0beef9061 Merge pull request #530 from UdjinM6/v0.12.0.x_translations20150815
V0.12.0.x translations20150815
2015-08-15 13:08:09 -07:00
UdjinM6
9d3dc79b91 add masternodeSync.GetSyncStatus() / refactor mn sync status UI updates 2015-08-15 18:53:55 +03:00
UdjinM6
812cc6bbb1 let translations mix qt and printf 2015-08-15 17:32:55 +03:00
UdjinM6
121124dc1e translations 2015-08-15 17:32:23 +03:00
UdjinM6
4ddb2c65c3 fixes for masternrode rpc 2015-08-15 17:22:56 +03:00
UdjinM6
1289327743 fix GetSporkValue 2015-08-15 16:34:38 +03:00
UdjinM6
d1e189fb57 add mn list and mnw timeouts / use gettime / lower base timeout 2015-08-15 16:30:30 +03:00
Evan Duffield
24b7028b2e lock wallet for select 2015-08-14 19:06:00 -07:00
Evan Duffield
0d5ca11c9a check mnw peer version 2015-08-14 16:22:16 -07:00
Evan Duffield
6040fc6f83 fix GetSporkValue return 2015-08-14 12:57:41 -07:00
Alex Morcos
bba3db1a40 Fix masking of irrelevant bits in address groups. 2015-08-14 14:25:19 -05:00
Evan Duffield
cfe1bdd1e2 fix spork int error 2015-08-14 11:43:28 -07:00