Commit Graph

9473 Commits

Author SHA1 Message Date
Evan Duffield
50d1b827eb Fixed proposal fee IX confirmations 2015-07-14 12:52:46 -07:00
Evan Duffield
30ea44322e Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-07-14 08:04:18 -07:00
Evan Duffield
c2d4b553c5 version bump 2015-07-14 08:04:07 -07:00
evan82
eb7ca6fdef Merge pull request #430 from UdjinM6/v0.12.0.x_mergebtc
V0.12.0.x merge latest fixes from bitcoin 10.0.2
2015-07-14 07:55:38 -07:00
Evan Duffield
d228b4bf47 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-07-14 07:55:07 -07:00
Evan Duffield
907aa36ed1 Merge branch 'UdjinM6-v0.12.0.x_lower_mn_reuse' into v0.12.0.x 2015-07-14 07:44:41 -07:00
Evan Duffield
665a93cd4f Merge branch 'v0.12.0.x_lower_mn_reuse' of https://github.com/UdjinM6/dash into UdjinM6-v0.12.0.x_lower_mn_reuse 2015-07-14 07:44:22 -07:00
evan82
a0a4940097 Merge pull request #428 from UdjinM6/v0.12.0.x_fix_IsBudgetCollateralValid_log
V0.12.0.x Fix CBudgetProposalBroadcast::IsBudgetCollateralValid log output / strError
2015-07-14 07:43:08 -07:00
evan82
eb9aa2cb87 Merge pull request #427 from UdjinM6/v0.12.0.x_change_sync_activemn_start
V0.12.0.x Start all DS, mnodeman, IX related checks and activate mn only after sync is over
2015-07-14 07:41:57 -07:00
evan82
d98a6fae23 Merge pull request #426 from UdjinM6/v0.12.0.x_mnb_mnp
V0.12.0.x major (incompatible) masternode broadcast/ping changes
2015-07-14 07:41:09 -07:00
Evan Duffield
e57f2d4003 Check IsValid when preparing fee 2015-07-14 07:05:33 -07:00
Suhas Daftuar
c2ffbe5bdd Ignore getheaders requests when not synced.
Rebased-From: a1ba0778dd
Github-Pull: #6172
2015-07-14 13:19:47 +03:00
Alex Morcos
09a4cb65fc Fix removing of orphan transactions
We don't want to erase orphans that still have missing inputs, they should still be tracked as orphans.  Also, the transaction thats being accepted can't be an orphan otherwise it would have previously been accepted, so doesn't need to be added to the erase queue.

Github-Pull: #5985
Rebased-From: 14d4eef799
2015-07-14 13:19:47 +03:00
Wladimir J. van der Laan
3f556edc61 doc: update mailing list address
Move from sourceforge to linux foundation.

Also get rid of some other stale mentions of sourceforge.

Github-Pull: #6319
Rebased-From: 88d8525ca2
2015-07-14 13:19:46 +03:00
Wladimir J. van der Laan
850dcb9334 Add option -alerts to opt out of alert system
Make it possible to opt-out of the centralized alert system by providing
an option `-noalerts` or `-alerts=0`. The default remains unchanged.

This is a gentler form of #6260, in which I went a bit overboard by
removing the alert system completely.

I intend to add this to the GUI options in another pull after this.

Conflicts:
	src/init.cpp
	src/main.cpp

Github-Pull: #6274
Rebased-From: 02a6702a82
2015-07-14 13:19:09 +03:00
Tom Harding
84b483e3c3 Fix getbalance *
Chance "getbalance *" not to use IsTrusted.  The method and result
now match the "getbalance <specific-account>" behavior. In
particular, "getbalance * 0" now works.

Also fixed a comment -- GetGalance has required 1 confirmation
for many years, and the default "getbalance *" behavior matches
that.

Github-Pull: #6276
Rebased-From: 7d6a85ab5b
Rebased-By: @trasher-
2015-07-14 13:19:09 +03:00
Luke Dashjr
cee7c2e1f3 configure: Detect (and reject) LibreSSL
Rebased-From: a5a81f7354
Github-Pull: #6244
2015-07-14 13:19:09 +03:00
Wladimir J. van der Laan
c709b86a5d json: fail read_string if string contains trailing garbage
Change `read_string` to fail when not the entire input has been
consumed. This avoids unexpected, even dangerous behavior (fixes #6223).

The new JSON parser adapted in #6121 also solves this problem so in
master this is a temporary fix, but should be backported to older releases.

Also adds tests for the new behavior.

Github-Pull: #6226
Rebased-From: 4e157fc60d
2015-07-14 13:19:08 +03:00
Luke Dashjr
2fc7256f72 Remove P2SH coinbase flag, no longer interesting
Github-Pull: #6203
Rebased-From: d449772cf6
2015-07-14 13:19:08 +03:00
Wladimir J. van der Laan
d2ccd08ef1 Parameter interaction: disable upnp if -proxy set
To protect privacy, do not use UPNP when a proxy is set. The user may
still specify -listen=1 to listen locally (for a hidden service), so
don't rely on this happening through -listen.

Fixes #2927.

Conflicts:
	src/init.cpp

Rebased-From: 8c35b6f3be
Github-Pull: #6153
2015-07-14 13:19:08 +03:00
Wladimir J. van der Laan
07053c3ada Fix two problems in CSubNet parsing
Fix two CSubNet constructor problems:

- The use of `/x` where 8 does not divide x was broken, due to a
  bit-order issue

- The use of e.g. `1.2.3.4/24` where the netmasked bits in the network
  are not 0 was broken. Fix this by explicitly normalizing the netwok
  according to the bitmask.

Also add tests for these cases.

Fixes #6179. Thanks to @jonasschnelli for reporting and initial fix.

Rebased-From: b45c50ce51
Github-Pull: #6186
2015-07-14 13:19:07 +03:00
Wladimir J. van der Laan
bd3ed5c280 Simplify code for CSubnet
Simplify the code by using CAddress.ip directly, instead of the reversed
GetByte() semantics.

Rebased-From: 19e8d7be42
Github-Pull: #6186
2015-07-14 13:19:07 +03:00
UdjinM6
59271beabd Fix CBudgetProposalBroadcast::IsBudgetCollateralValid log output / strError 2015-07-14 11:32:49 +03:00
UdjinM6
6651abe343 lower mn reuse rate 2015-07-14 10:38:04 +03:00
UdjinM6
f2c5653379 Start all ds, mnodeman, ix related checks and activate mn only after sync is over 2015-07-14 09:16:19 +03:00
UdjinM6
3ef2cec49d proto bump 2015-07-14 08:59:08 +03:00
UdjinM6
26fed43603 Major masternode broadcast/ping changes (incompatible with prev version, proto bump required):
- Do not rely on local lastTimeSeen and requested fRequested anymore. Use last know (signed) ping instead and base all logic on that. Should reduce mn list difference between
 nodes.
- Rework CActiveMasternode accordingly along with states, errorMessages, rpc etc.
- Clean some related code, move parts from public to private
- drop c_str in LogPrintf that were related to this functionality (todo: drop it for LogPrintf everywhere else)
2015-07-14 08:50:30 +03:00
Evan Duffield
bee6941195 Fixed Propagation Of Budgets / Proto Bump 2015-07-13 20:03:08 -07:00
Evan Duffield
6fa0d23714 Commit collateral transaction correctly for finalized budget 2015-07-13 06:34:54 -07:00
Evan Duffield
40a14cb802 version bump / proto bump 2015-07-12 16:39:37 -07:00
Evan Duffield
acf09d1bc1 Collateral is now checked for age 2015-07-12 16:37:55 -07:00
Evan Duffield
8e7c4e7491 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-07-12 14:04:00 -07:00
Evan Duffield
304ab6c7ab Various improvements to the proposal system
- Proposal scripts are now checked correctly
- Fee transactions are created correctly for IX and non-IX types
2015-07-12 14:02:39 -07:00
evan82
1cbd0aace5 Merge pull request #425 from crowning-/UI_Enhancements
Minor Coincontrol-Dialog enhancements
2015-07-12 12:44:47 -07:00
crowning-
9b170483b7 Minor Options-Dialog enhancements 2015-07-12 20:23:38 +02:00
crowning-
3f19365d2a Minor Coincontrol-Dialog enhancements 2015-07-12 20:04:52 +02:00
evan82
82bb9617ee Merge pull request #424 from UdjinM6/v0.12.0.x_fix_progress
V0.12.0.x calculate ds progress from 3 parts
2015-07-12 10:48:05 -07:00
evan82
bacd3e456f Merge pull request #423 from crowning-/UI_Enhancements
De-selecting all transactions resets computed sum to 0 now.
2015-07-12 10:47:52 -07:00
Evan Duffield
2885f9e6ca protocol bump / version bump 2015-07-12 10:47:28 -07:00
Evan Duffield
6b7ab34d30 Budget collateral changes
- Use OP_RETURN >> BudgetHash, with an output the size of BUDGET_FEE_TX. This will allow us to burn coins, that will be recreated and avoid hitting the "insane fee" checks
2015-07-12 10:38:32 -07:00
Evan Duffield
0b3ef3c9fe Various fixes
- Proposal submitting now works properly
- Syncing proposals now works properly
- Finalized budgets are now created correctly
2015-07-12 10:34:21 -07:00
UdjinM6
e7b00b8b7e calculate ds progress from 3 parts 2015-07-12 19:18:03 +03:00
crowning-
604914c15e De-selecting all transactions resets computed sum to 0 now. 2015-07-12 18:00:48 +02:00
Evan Duffield
0a02fa00bb removed vote from prepare/submit and fixed some help strings 2015-07-12 08:09:06 -07:00
evan82
635a5fbf97 Merge pull request #422 from crowning-/v0.12.0.x
Fix Darksend completion UI
2015-07-12 07:46:23 -07:00
Evan Duffield
a59c5d9edd fixed issues with rpc commands 2015-07-12 07:45:58 -07:00
crowning-
60358c28e2 Fix Darksend completion UI 2015-07-12 12:57:59 +02:00
evan82
40306a10c0 Merge pull request #421 from UdjinM6/v0.12.0.x_fix_mnbudget_rpc
V0.12.0.x fix mnbudget rpc
2015-07-12 00:42:58 -07:00
UdjinM6
2dbf8290f7 Few fixes for mnbudget rpc
- do not ask for vote on prepare and submit
- fix bug found by @thelazier
- fix command descriptions to avoid confusions
- tiny refactoring for tx/ix
2015-07-12 09:39:22 +03:00
Evan Duffield
640e721487 fixed spork show 2015-07-11 16:17:03 -07:00