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

Daily merge upstream

Browse Source
This commit is contained in:
crowning2 2015-02-17 19:59:54 +01:00
commit 79aa755396
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clientversion.h
View File

@ -11,8 +11,8 @@
// These need to be macros, as version.cpp's and darkcoin-qt.rc's voodoo requires it // These need to be macros, as version.cpp's and darkcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 11 #define CLIENT_VERSION_MINOR 11
#define CLIENT_VERSION_REVISION 1 #define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 25 #define CLIENT_VERSION_BUILD 0

2
src/core.h
View File

@ -15,7 +15,7 @@
#define START_MASTERNODE_PAYMENTS_TESTNET 1420837558 //Fri, 09 Jan 2015 21:05:58 GMT #define START_MASTERNODE_PAYMENTS_TESTNET 1420837558 //Fri, 09 Jan 2015 21:05:58 GMT
#define START_MASTERNODE_PAYMENTS 1403728576 //Wed, 25 Jun 2014 20:36:16 GMT #define START_MASTERNODE_PAYMENTS 1403728576 //Wed, 25 Jun 2014 20:36:16 GMT
static const int64_t DARKSEND_COLLATERAL = (0.1*COIN); static const int64_t DARKSEND_COLLATERAL = (0.01*COIN);
static const int64_t DARKSEND_FEE = (0.0125*COIN); static const int64_t DARKSEND_FEE = (0.0125*COIN);
static const int64_t DARKSEND_POOL_MAX = (999.99*COIN); static const int64_t DARKSEND_POOL_MAX = (999.99*COIN);

8
src/darksend.cpp
View File

@ -807,7 +807,7 @@ void CDarkSendPool::ChargeRandomFees(){
int i = 0; int i = 0;
BOOST_FOREACH(const CTransaction& txCollateral, vecSessionCollateral) { BOOST_FOREACH(const CTransaction& txCollateral, vecSessionCollateral) {
int r = rand()%1000; int r = rand()%100;
/* /*
Collateral Fee Charges: Collateral Fee Charges:
@ -815,10 +815,10 @@ void CDarkSendPool::ChargeRandomFees(){
Being that DarkSend has "no fees" we need to have some kind of cost associated Being that DarkSend has "no fees" we need to have some kind of cost associated
with using it to stop abuse. Otherwise it could serve as an attack vector and with using it to stop abuse. Otherwise it could serve as an attack vector and
allow endless transaction that would bloat Darkcoin and make it unusable. To allow endless transaction that would bloat Darkcoin and make it unusable. To
stop these kinds of attacks 1 in 50 successful transactions are charged. This stop these kinds of attacks 1 in 10 successful transactions are charged. This
adds up to a cost of 0.002DRK per transaction on average. adds up to a cost of 0.001DRK per transaction on average.
*/ */
if(r <= 20) if(r <= 10)
{ {
LogPrintf("CDarkSendPool::ChargeRandomFees -- charging random fees. %u\n", i); LogPrintf("CDarkSendPool::ChargeRandomFees -- charging random fees. %u\n", i);