Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.12.0.55 #627

Merged
merged 23 commits into from
Sep 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cabef59
Merge branch 'master' into v0.12.0.x
schinzelh Sep 4, 2015
2c53939
version bump v54
schinzelh Sep 4, 2015
9aab0eb
Merge branch 'master' into v0.12.0.x
schinzelh Sep 7, 2015
792c5b8
fix: GetRemainingPaymentCount was off by 1
UdjinM6 Sep 7, 2015
818303d
Merge pull request #602 from UdjinM6/remainingoffby1
eduffield82 Sep 7, 2015
602d1b2
DS: try to use only inputs with the same number of rounds starting fr…
UdjinM6 Sep 9, 2015
0c3a029
huge update to sk translation (thanks xsedivy!)
UdjinM6 Sep 9, 2015
ae14019
IX fixes:
UdjinM6 Sep 11, 2015
9710b50
change threadSafe (i.e. cs_main lock usage) for Dash rpc commands
UdjinM6 Sep 9, 2015
79e2c54
translations: vi to 100%
UdjinM6 Sep 15, 2015
af3e28c
Merge pull request #616 from UdjinM6/translations_vi
eduffield82 Sep 15, 2015
06e351d
Merge pull request #607 from UdjinM6/matchrounds
eduffield82 Sep 15, 2015
b8739c0
Merge pull request #610 from UdjinM6/ixfixes
eduffield82 Sep 15, 2015
5e656df
Merge pull request #608 from UdjinM6/translation_sk
eduffield82 Sep 15, 2015
3d91fe3
add mnbudgetvoteraw
UdjinM6 Sep 23, 2015
de478cb
fix LP inter-mixing by not initiating new queues by them
UdjinM6 Sep 24, 2015
87766f5
Merge pull request #623 from UdjinM6/fixlpintermixing
eduffield82 Sep 24, 2015
4733285
v55
Sep 25, 2015
bda45f1
More liberal block creation
Sep 26, 2015
71272d4
Fixed IX confirmation bug for gettransaction
Sep 26, 2015
e98fc3a
huge update for Chinese and Japanese(include it in the list now)
UdjinM6 Sep 28, 2015
82c2f06
Merge pull request #625 from UdjinM6/translations20150928
eduffield82 Sep 28, 2015
6509adf
Revert "More liberal block creation"
Sep 28, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 12)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 53)
define(_CLIENT_VERSION_BUILD, 55)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2015)
AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash])
Expand Down
1 change: 1 addition & 0 deletions contrib/dash-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@ TRANSLATIONS += src/qt/locale/dash_bg.ts \
src/qt/locale/dash_fi.ts \
src/qt/locale/dash_fr.ts \
src/qt/locale/dash_it.ts \
src/qt/locale/dash_ja.ts \
src/qt/locale/dash_pl.ts \
src/qt/locale/dash_pt.ts \
src/qt/locale/dash_ru.ts \
Expand Down
1 change: 1 addition & 0 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ QT_TS = \
qt/locale/dash_fi.ts \
qt/locale/dash_fr.ts \
qt/locale/dash_it.ts \
qt/locale/dash_ja.ts \
qt/locale/dash_pl.ts \
qt/locale/dash_pt.ts \
qt/locale/dash_ru.ts \
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 12
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 53
#define CLIENT_VERSION_BUILD 55

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
20 changes: 16 additions & 4 deletions src/darksend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,9 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun)
}
}

// do not initiate queue if we are a liquidity proveder to avoid useless inter-mixing
if(nLiquidityProvider) return false;

int i = 0;

// otherwise, try one randomly
Expand Down Expand Up @@ -1625,12 +1628,21 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun)

bool CDarksendPool::PrepareDarksendDenominate()
{
// Submit transaction to the pool if we get here, use sessionDenom so we use the same amount of money
std::string strError = pwalletMain->PrepareDarksendDenominate(0, nDarksendRounds);
LogPrintf("DoAutomaticDenominating : Running Darksend denominate. Return '%s'\n", strError);

std::string strError = "";
// Submit transaction to the pool if we get here
// Try to use only inputs with the same number of rounds starting from lowest number of rounds possible
for(int i = 0; i < nDarksendRounds; i++) {
strError = pwalletMain->PrepareDarksendDenominate(i, i+1);
LogPrintf("DoAutomaticDenominating : Running Darksend denominate for %d rounds. Return '%s'\n", i, strError);
if(strError == "") return true;
}

// We failed? That's strange but let's just make final attempt and try to mix everything
strError = pwalletMain->PrepareDarksendDenominate(0, nDarksendRounds);
LogPrintf("DoAutomaticDenominating : Running Darksend denominate for all rounds. Return '%s'\n", strError);
if(strError == "") return true;

// Should never actually get here but just in case
strAutoDenomResult = strError;
LogPrintf("DoAutomaticDenominating : Error running denominate, %s\n", strError);
return false;
Expand Down
18 changes: 9 additions & 9 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ std::string HelpMessage(HelpMessageMode mode)

strUsage += "\n" + _("InstantX options:") + "\n";
strUsage += " -enableinstantx=<n> " + strprintf(_("Enable instantx, show confirmations for locked transactions (bool, default: %s)"), "true") + "\n";
strUsage += " -instantxdepth=<n> " + strprintf(_("Show N confirmations for a successfully locked transaction (0-9999, default: %u)"), 1) + "\n";
strUsage += " -instantxdepth=<n> " + strprintf(_("Show N confirmations for a successfully locked transaction (0-9999, default: %u)"), nInstantXDepth) + "\n";

strUsage += "\n" + _("Node relay options:") + "\n";
strUsage += " -datacarrier " + strprintf(_("Relay and mine data carrier transactions (default: %u)"), 1) + "\n";
Expand Down Expand Up @@ -698,6 +698,11 @@ bool AppInit2(boost::thread_group& threadGroup)
LogPrintf("AppInit2 : parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n");
}

if(!GetBoolArg("-enableinstantx", fEnableInstantX)){
if (SoftSetArg("-instantxdepth", 0))
LogPrintf("AppInit2 : parameter interaction: -enableinstantx=false -> setting -nInstantXDepth=0\n");
}

// Make sure enough file descriptors are available
int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);
nMaxConnections = GetArg("-maxconnections", 125);
Expand Down Expand Up @@ -1532,14 +1537,9 @@ bool AppInit2(boost::thread_group& threadGroup)
if(nAnonymizeDarkcoinAmount > 999999) nAnonymizeDarkcoinAmount = 999999;
if(nAnonymizeDarkcoinAmount < 2) nAnonymizeDarkcoinAmount = 2;

bool fEnableInstantX = GetBoolArg("-enableinstantx", true);
if(fEnableInstantX){
nInstantXDepth = GetArg("-instantxdepth", 5);
if(nInstantXDepth > 60) nInstantXDepth = 60;
if(nInstantXDepth < 0) nAnonymizeDarkcoinAmount = 0;
} else {
nInstantXDepth = 0;
}
fEnableInstantX = GetBoolArg("-enableinstantx", fEnableInstantX);
nInstantXDepth = GetArg("-instantxdepth", nInstantXDepth);
nInstantXDepth = std::min(std::max(nInstantXDepth, 0), 60);

//lite mode disables all Masternode and Darksend related functionality
fLiteMode = GetBoolArg("-litemode", false);
Expand Down
5 changes: 2 additions & 3 deletions src/masternode-budget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1487,10 +1487,9 @@ int CBudgetProposal::GetTotalPaymentCount()
int CBudgetProposal::GetRemainingPaymentCount()
{
// If this budget starts in the future, this value will be wrong
int nPayments = (GetBlockEndCycle() - GetBlockCurrentCycle()) / GetBudgetPaymentCycleBlocks();
int nTotal = (GetBlockEndCycle() - GetBlockStartCycle()) / GetBudgetPaymentCycleBlocks();
int nPayments = (GetBlockEndCycle() - GetBlockCurrentCycle()) / GetBudgetPaymentCycleBlocks() - 1;
// Take the lowest value
return (nPayments <= nTotal ? nPayments : nTotal);
return std::min(nPayments, GetTotalPaymentCount());
}

CBudgetProposalBroadcast::CBudgetProposalBroadcast(std::string strProposalNameIn, std::string strURLIn, int nPaymentCount, CScript addressIn, CAmount nAmountIn, int nBlockStartIn, uint256 nFeeTXHashIn)
Expand Down
3 changes: 2 additions & 1 deletion src/qt/dash_locale.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
<file alias="fi">locale/dash_fi.qm</file>
<file alias="fr">locale/dash_fr.qm</file>
<file alias="it">locale/dash_it.qm</file>
<file alias="it">locale/dash_ja.qm</file>
<file alias="pl">locale/dash_pl.qm</file>
<file alias="pt">locale/dash_pt.qm</file>
<file alias="ru">locale/dash_ru.qm</file>
<file alias="sv">locale/dash_sk.qm</file>
<file alias="sk">locale/dash_sk.qm</file>
<file alias="sv">locale/dash_sv.qm</file>
<file alias="vi">locale/dash_vi.qm</file>
<file alias="zh_CN">locale/dash_zh_CN.qm</file>
Expand Down
4 changes: 4 additions & 0 deletions src/qt/locale/dash_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4391,6 +4391,10 @@ Pour exemple: alertnotify=echo %%s | mail -s "Alerte Dash" admin@foo.com
<source>Specify your own public address</source>
<translation>Spécifier votre propre adresse publique</translation>
</message>
<message>
<source>Synchronization pending...</source>
<translation>Synchronisation en suspens...</translation>
</message>
<message>
<source>This help message</source>
<translation>Ce message d'aide</translation>
Expand Down
Loading