sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,300 Commits 24 Branches 554 Tags 576 MiB
2fc7256f72
Commit Graph

9300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Evan Duffield
03d6f3c140 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-07-11 13:26:22 -07:00
Evan Duffield
c701839a43 Proposal Security Overhaul 
Submissions to the network now require a fee to be paid to the network (mining fee) using a special transaction with a OP_RETURN && ProposalHash in one of the outputs. This allows the network to filter spam quickly, while also allowing anyone to submit a proposal to the network.

To implement these changes we've introduced a few new commands:

mnbudget prepare PROPOSAL-NAME URL PAYMENT_COUNT BLOCK_START DASH_ADDRESS DASH_AMOUNT YES|NO|ABSTAIN [USE_IX(TRUE|FALSE)]
- To create the special transaction

mnbudget submit PROPOSAL-NAME URL PAYMENT_COUNT BLOCK_START DASH_ADDRESS DASH_AMOUNT YES|NO|ABSTAIN FEE_TX
- After the transaction is accepted by the network and has 3 confirmations, you can submit the transaction to the network here

mnbudget show
- Get the proposal hash from here

mnbudget vote PROPOSAL-HASH YES|NO|ABSTAIN
- You can now simply vote by hash using this command
 2015-07-11 13:20:12 -07:00
evan82
b360b8728c Merge pull request #418 from UdjinM6/v0.12.0.x_temporary_unlock_mn_coins 
V0.12.0.x Temporary unlock MN coins (locked by -mnconflock) on masternode start-alias/many
 2015-07-10 10:06:49 -07:00
UdjinM6
1f978f561c Temporary unlock MN coins locked by -mnconflock on masternode start-alias/many and immediately lock them back right after finding all available coins 2015-07-10 19:53:51 +03:00
evan82
4a514b7e7c Merge pull request #420 from UdjinM6/v0.12.0.x_masternode.conf_err_verbose 
V0.12.0.x make masternode.conf parsing more verbose on errors / translate strings
 2015-07-10 09:18:37 -07:00
UdjinM6
7a09989195 make masternode.conf parsing more verbose on errors / translate strings 2015-07-10 19:08:50 +03:00
evan82
0e89bbae92 Merge pull request #419 from UdjinM6/v0.12.0.x_fix_alternative_units_in_send 
V0.12.0.x fix alternative units in send dialog
 2015-07-09 06:34:02 -07:00
UdjinM6
d597653615 fix alternative units in send dialog 2015-07-09 06:54:30 +03:00
Evan Duffield
2d118769f0 version/proto bump 2015-07-08 10:27:26 -07:00
Evan Duffield
8a5ebeaa62 added spork for reseting budget 2015-07-08 10:25:47 -07:00
Evan Duffield
a351456c17 Fixed invalid saved budget.dat issue 2015-07-08 10:17:16 -07:00
Evan Duffield
91a0887a0d Fix active removal of proposals 2015-07-08 08:55:52 -07:00
Evan Duffield
a8f5472037 fixed compile error 2015-07-08 08:19:07 -07:00
evan82
246037abdb Merge pull request #415 from UdjinM6/v0.12.0.x_budgets_var_naming_logging 
V0.12.0.x use proper naming for variables in masternode-budget
 2015-07-08 07:35:20 -07:00
evan82
872ef7f9a9 Merge pull request #414 from UdjinM6/v0.12.0.x_fix_minmnpaymentsproto 
V0.12.0.x fix min mnpayments proto usage
 2015-07-08 07:20:31 -07:00
evan82
2a3b96e020 Merge pull request #411 from UdjinM6/v0.12.0.x_various_small_fixes 
V0.12.0.x various small fixes
 2015-07-08 07:19:41 -07:00
evan82
dea8f15668 Merge pull request #413 from UdjinM6/v0.12.0.x_relayinv 
V0.12.0.x introduce RelayInv
 2015-07-08 07:17:47 -07:00
evan82
69aced6378 Merge pull request #409 from UdjinM6/v0.12.0.x_fix_GetInputDarksendRounds 
V0.12.0.x Fix GetInputDarksendRounds
 2015-07-08 07:16:29 -07:00
evan82
87207fbc36 Merge pull request #410 from UdjinM6/v0.12.0.x_fix_progress 
V0.12.0.x (Yet) another attempt to get DS progress displayed right
 2015-07-08 07:15:39 -07:00
evan82
5914a24f47 Merge pull request #408 from crowning-/v0.12.0.x 
satoshi(s) -> duff(s) in locales
 2015-07-08 07:15:29 -07:00
evan82
ede21b01fd Merge pull request #407 from UdjinM6/v0.12.0.x_satoshi_duff_dash 
V0.12.0.x satoshi(s) -> duff(s)  &  Satoshi:x.x.x -> Dash Core:x.x.x
 2015-07-08 07:15:09 -07:00
evan82
1a3975eab0 Merge pull request #406 from UdjinM6/v0.12.0.x_safer_PrepareDarksendDenominate 
v0.12.0.x Implement safer version of CWallet::PrepareDarksendDenominate
 2015-07-08 07:14:36 -07:00
UdjinM6
2fdb5b01f7 use proper naming for variables in masternode-budget 2015-07-08 05:35:58 +03:00