Merge pull request #627 from dashpay/v0.12.0.x

release v0.12.0.55

configure.ac

@@ -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])

contrib/dash-qt.pro

@@ -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 \

src/Makefile.qt.include

@@ -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 \

src/clientversion.h

@@ -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

src/darksend.cpp

@@ -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
@@ -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;

src/init.cpp

@@ -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";
@@ -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);
@@ -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);

src/masternode-budget.cpp

@@ -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)

src/qt/dash_locale.qrc

@@ -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>

src/qt/locale/dash_fr.ts

@@ -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>