Commit Graph

12485 Commits

Author SHA1 Message Date
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
UdjinM6
f0790ed32c fix dseep flood / log output 2015-08-14 04:14:08 +03:00
Evan Duffield
4727d92d1f protocol bump 2015-08-13 16:35:38 -07:00
Evan Duffield
d8b18c31f7 Remove blockEnd budget check 2015-08-13 14:02:37 -07:00
Evan Duffield
60c4ab8292 change proposal requirements 2015-08-13 13:01:10 -07:00
Evan Duffield
9ee73cd238 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash 2015-08-13 09:39:12 -07:00
evan82
49af767670 Merge pull request #521 from dashpay/revert-520-v0.12.0.x_stop_mining_before_synced
Revert "V0.12.0.x stop mining before completely synced, more info in …
2015-08-13 09:38:48 -07:00
evan82
7bef018c22 Revert "V0.12.0.x stop mining before completely synced, more info in rpc" 2015-08-13 09:38:23 -07:00
Evan Duffield
eb812430cd Merge branch 'v0.12.0.x' 2015-08-13 09:03:55 -07:00
evan82
ada6a090c9 Merge pull request #520 from UdjinM6/v0.12.0.x_stop_mining_before_synced
V0.12.0.x stop mining before completely synced, more info in rpc
2015-08-13 08:25:48 -07:00
Evan Duffield
88830d4ac1 version bump 2015-08-13 08:09:28 -07:00
Evan Duffield
7bdb18a602 fixed parameters for IsBlockChainSynced 2015-08-13 08:04:25 -07:00
fanquake
183b8fbeb0 Add missing files to files.md
typo
2015-08-13 22:54:55 +08:00
Evan Duffield
792bf4fb85 Allow sync of older mnfinalbudgets 2015-08-13 07:53:55 -07:00
UdjinM6
ac488d70b9 stop mining before completely synced, more info in rpc 2015-08-13 16:50:17 +03:00
UdjinM6
65ec00d6ec hide "out of sync" warning on blockchain sync 2015-08-13 16:03:39 +03:00
evan82
e52809a031 Merge pull request #511 from UdjinM6/v0.12.0.x_cleanup
V0.12.0.x cleanup & translations
2015-08-12 19:38:40 -07:00
Adam Weiss
243b80d292 Handle leveldb::DestroyDB() errors on wipe failure
Add error checking to CLevelDBWrapper for errors from
leveldb::DestroyDB().  Without it, if unlink() or DeleteFileW() fail to
delete files, they will fail silent.  If they fail to delete any files,
CLevelDBWrapper will silently open and read the existing database.

Typically any permissions issues would be caught by leveldb as it churns
through many files as part of its compaction process, but it is
conceivable that this could cause problems on Windows with anti-virus
and indexing software.
2015-08-12 19:40:09 -04:00
Evan Duffield
6ff903f27b Wait for DS confirmation 2015-08-12 15:54:21 -07:00