Commit Graph

12603 Commits

Author SHA1 Message Date
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
Evan Duffield
61223ed147 Fix dseg message 2015-08-14 09:15:50 -07:00
Evan Duffield
700bf2798f Merge branch 'v0.12.0.x' 2015-08-14 07:40:22 -07:00
evan82
ea8d508561 Merge pull request #519 from UdjinM6/v0.12.0.x_hide_oosw_on_bc
V0.12.0.x hide "out of sync" warning on blockchain sync
2015-08-14 07:39:18 -07:00
Evan Duffield
5ce46672e2 Merge branch 'v0.12.0.x' 2015-08-14 07:30:21 -07:00
Wladimir J. van der Laan
ddd8d80c63
Merge pull request #6415
d042854 SQUASH "Implement watchonly support in fundrawtransaction" (Matt Corallo)
428a898 SQUASH "Add have-pubkey distinction to ISMINE flags" (Matt Corallo)
6bdb474 Implement watchonly support in fundrawtransaction (Matt Corallo)
f5813bd Add logic to track pubkeys as watch-only, not just scripts (Matt Corallo)
d3354c5 Add have-pubkey distinction to ISMINE flags (Matt Corallo)
5c17059 Update importaddress help to push its use to script-only (Matt Corallo)
a1d7df3 Add importpubkey method to import a watch-only pubkey (Matt Corallo)
907a425 Add p2sh option to importaddress to import redeemScripts (Matt Corallo)
983d2d9 Split up importaddress into helper functions (Matt Corallo)
cfc3dd3 Also remove pay-2-pubkey from watch when adding a priv key (Matt Corallo)
2015-08-14 16:28:37 +02:00
evan82
c062c4b650 Merge pull request #525 from UdjinM6/v0.12.0.x_dsee_dseep
V0.12.0.x more fixes - "dsee updated entry"
2015-08-14 07:17:44 -07:00
Evan Duffield
54ee699112 nBlockEnd/nAmount budget item check
- Make sure nBlockEnd > nBlockStart+Cycle
- Make sure nAmount is more than 1DASH
2015-08-14 06:35:36 -07:00
Evan Duffield
c1b860bfb5 Merge branch 'v0.12.0.x' 2015-08-14 05:52:26 -07:00
UdjinM6
001b8cf709 more fixes - dsee updated entry 2015-08-14 08:11:57 +03:00
Pavel Janík
70180b2e57 Implement REST mempool API, add test and documentation. 2015-08-14 07:01:03 +02:00
evan82
c936bfe7f3 Merge pull request #524 from UdjinM6/v0.12.0.x_dsee_dseep
V0.12.0.x more fixes - misbehave / rpc
2015-08-13 21:02:23 -07:00
Evan Duffield
5b9c1d2b3c Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-08-13 20:57:12 -07:00
Evan Duffield
dc70f73221 add budget timeout 2015-08-13 20:56:58 -07:00
UdjinM6
61239dbb36 more fixes - misbehave / rpc 2015-08-14 06:18:08 +03:00
UdjinM6
821c2d84e3 Merge pull request #523 from UdjinM6/v0.12.0.x_dsee_dseep
V0.12.0.x possible fix for dseep flood / log output
2015-08-14 05:05:06 +03:00