Changes for 1.0.15 (#108)

durkmurder · web-flow · commit ccb1a7c650a9 · 2018-08-21T22:10:47.000+03:00
* Updated segwit deployment time for testnet * Updated genesis for testnet, changed segwit deployment time * Uptdating segwit starttime for TestNet * Need more time on segwit starttime for TestNet * Final test segwit starttime for TestNet * Added -clearmncache as allowed arg (#95) * Fixed rescaning of wallet when refreshing tposcontract (#97) * Fixed compilation issue on CentOS 7 (#98) * Added slot for handling click on "toogle locked state" button in coincontrolldialog (#99) * Fixed RPC call for getblock to show tposcontract * Prepared for 1.0.14 release Updated version to 1.0.14, updated build type to "release" * Changed IS_RELEASE to false * Bugfix/103 (#105) * Fixed tposcontract cleanup issue, fixed typo mistakes in UI * Fixed issue with filtering MintedTPoS, fixed issue with sendtoadress with amount of splits * bugfix/101 (#102) * Added setstakesplitthreshold into vRPCConvertParams * Update sync.h * Updated staking settings startup param * Updated version to 1.0.15 * Added tpos commission as filter option
diff --git a/configure.ac b/configure.ac
@@ -2,9 +2,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 14)
+define(_CLIENT_VERSION_REVISION, 15)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_IS_RELEASE, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[XSN Core]])
diff --git a/src/XSNBtc.config b/src/XSNBtc.config
@@ -1,3 +1,4 @@
 // Add predefined macros for your project here. For example:
 // #define THE_ANSWER 42
 #define ENABLE_WALLET
+#define ENABLE_ZMQ
diff --git a/src/init.cpp b/src/init.cpp
@@ -601,6 +601,7 @@ void SetupServerArgs()
     gArgs.AddArg("-server", "Accept command line and JSON-RPC commands", false, OptionsCategory::RPC);
 
     gArgs.AddArg("-sporkkey", "Private key to send spork messages", false, OptionsCategory::OPTIONS);
+    gArgs.AddArg("-staking", "Enable staking while working with wallet, default is 1", false, OptionsCategory::OPTIONS);
     gArgs.AddArg("-masternode=<n>", "Enable the client to act as a masternode (0-1, default: false", false, OptionsCategory::MASTERNODE);
     gArgs.AddArg("-mnconf=<file>", "Specify masternode configuration file (default: masternode.conf)", false, OptionsCategory::MASTERNODE);
     gArgs.AddArg("-mnconflock=<n>", "Lock masternodes from masternode configuration file (default: %u)", false, OptionsCategory::MASTERNODE);
@@ -2004,7 +2005,7 @@ bool AppInitMain()
     uiInterface.InitMessage(_("Done loading"));
 
     g_wallet_init_interface.Start(scheduler);
-    if(GetWallets().front())
+    if(GetWallets().front() && gArgs.GetBoolArg("-staking", true))
     {
         threadGroup.create_thread(std::bind(&ThreadStakeMinter, boost::ref(chainparams), boost::ref(connman), GetWallets().front()));
     }
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
@@ -112,7 +112,7 @@ void AskPassphraseDialog::accept()
             break;
         }
         QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"),
-                 tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"),
+                 tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR XSN</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"),
                  QMessageBox::Yes|QMessageBox::Cancel,
                  QMessageBox::Cancel);
         if(retval == QMessageBox::Yes)
diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui
@@ -288,7 +288,7 @@
        <item row="11" column="0">
         <widget class="QLabel" name="merchantnodeCountLabel">
          <property name="text">
-          <string>Number of Merchantodes</string>
+          <string>Number of Merchantnodes</string>
          </property>
         </widget>
        </item>
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
@@ -1,11 +1,12 @@
-// Copyright (c) 2011-2017 The Bitcoin Core developers
+ // Copyright (c) 2011-2017 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qt/transactionfilterproxy.h>
 
 #include <qt/transactiontablemodel.h>
 #include <qt/transactionrecord.h>
+#include "logging.h"
 
 #include <cstdlib>
 
@@ -36,6 +37,8 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
         return false;
 
     int type = index.data(TransactionTableModel::TypeRole).toInt();
+
+    uint32_t ntype = type;
     if (!(TYPE(type) & typeFilter))
         return false;
 
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
@@ -91,6 +91,8 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
     typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
     typeWidget->addItem(tr("Minted"), TransactionFilterProxy::TYPE(TransactionRecord::StakeMint));
+    typeWidget->addItem(tr("Minted(TPoS)"), TransactionFilterProxy::TYPE(TransactionRecord::StakeMintTPoS));
+    typeWidget->addItem(tr("Minted(TPoS Commission)"), TransactionFilterProxy::TYPE(TransactionRecord::StakeMintTPoSCommission));
     typeWidget->addItem(tr("Masternode Reward"), TransactionFilterProxy::TYPE(TransactionRecord::MNReward));
     typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
@@ -55,6 +55,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "getbalance", 1, "minconf" },
     { "getbalance", 2, "include_watchonly" },
     { "getblockhash", 0, "height" },
+    { "setstakesplitthreshold", 0, "value"},
+    { "sendtoaddress", 4, "amount_of_splits"},
     { "waitforblockheight", 0, "height" },
     { "waitforblockheight", 1, "timeout" },
     { "waitforblock", 1, "timeout" },
diff --git a/src/rpc/merchantnode.cpp b/src/rpc/merchantnode.cpp
@@ -461,7 +461,7 @@ UniValue tposcontract(const JSONRPCRequest& request)
         strCommand = request.params[0].get_str();
     }
 
-    if (request.fHelp  || (strCommand != "list" && strCommand != "create" && strCommand != "refresh"))
+    if (request.fHelp  || (strCommand != "list" && strCommand != "create" && strCommand != "refresh" && strCommand != "cleanup"))
         throw std::runtime_error(
                 "tposcontract \"command\"...\n"
                 "Set of commands to execute merchantnode related actions\n"
diff --git a/src/sync.h b/src/sync.h
@@ -12,7 +12,7 @@
 #include <thread>
 #include <mutex>
 
-//#define DEBUG_LOCKORDER
+// #define DEBUG_LOCKORDER
 
 ////////////////////////////////////////////////
 //                                            //
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -445,7 +445,7 @@ static UniValue getaddressesbyaccount(const JSONRPCRequest& request)
     return ret;
 }
 
-static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &address, CAmount nValue, bool fSubtractFeeFromAmount, const CCoinControl& coin_control, mapValue_t mapValue, std::string fromAccount)
+static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &address, CAmount nValue, bool fSubtractFeeFromAmount, int splitCount,const CCoinControl& coin_control, mapValue_t mapValue, std::string fromAccount)
 {
     CAmount curBalance = pwallet->GetBalance();
 
@@ -469,14 +469,28 @@ static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &
     std::string strError;
     std::vector<CRecipient> vecSend;
     int nChangePosRet = -1;
-    CRecipient recipient = {scriptPubKey, nValue, fSubtractFeeFromAmount};
-    vecSend.push_back(recipient);
     CTransactionRef tx;
+
+    for (int i = 0; i < splitCount; ++i)
+    {
+        if (i == splitCount - 1)
+        {
+            uint64_t nRemainder = nValue % splitCount;
+            vecSend.push_back({scriptPubKey, static_cast<CAmount>(nValue / splitCount + nRemainder), fSubtractFeeFromAmount});
+        }
+        else
+        {
+            vecSend.push_back({scriptPubKey, static_cast<CAmount>(nValue / splitCount), fSubtractFeeFromAmount});
+        }
+    }
+
+
     if (!pwallet->CreateTransaction(vecSend, tx, reservekey, nFeeRequired, nChangePosRet, strError, coin_control)) {
         if (!fSubtractFeeFromAmount && nValue + nFeeRequired > curBalance)
             strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }
+
     CValidationState state;
     if (!pwallet->CommitTransaction(tx, std::move(mapValue), {} /* orderForm */, std::move(fromAccount), reservekey, g_connman.get(), state)) {
         strError = strprintf("Error: The transaction was rejected! Reason given: %s", FormatStateMessage(state));
@@ -492,7 +506,7 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)
         return NullUniValue;
     }
 
-    if (request.fHelp || request.params.size() < 2 || request.params.size() > 8)
+    if (request.fHelp || request.params.size() < 2 || request.params.size() > 9)
         throw std::runtime_error(
                 "sendtoaddress \"address\" amount ( \"comment\" \"comment_to\" subtractfeefromamount replaceable conf_target \"estimate_mode\")\n"
                 "\nSend an amount to a given address.\n"
@@ -505,11 +519,12 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)
                                                                                                            "4. \"comment_to\"         (string, optional) A comment to store the name of the person or organization \n"
                                                                                                            "                             to which you're sending the transaction. This is not part of the \n"
                                                                                                            "                             transaction, just kept in your wallet.\n"
-                                                                                                           "5. subtractfeefromamount  (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n"
+                                                                                                           "5. \"amount of splits\"     (numeric, optional) amount of UTXO splits. \n"
+                                                                                                           "6. subtractfeefromamount  (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n"
                                                                                                            "                             The recipient will receive less xsns than you enter in the amount field.\n"
-                                                                                                           "6. replaceable            (boolean, optional) Allow this transaction to be replaced by a transaction with higher fees via BIP 125\n"
-                                                                                                           "7. conf_target            (numeric, optional) Confirmation target (in blocks)\n"
-                                                                                                           "8. \"estimate_mode\"      (string, optional, default=UNSET) The fee estimate mode, must be one of:\n"
+                                                                                                           "7. replaceable            (boolean, optional) Allow this transaction to be replaced by a transaction with higher fees via BIP 125\n"
+                                                                                                           "8. conf_target            (numeric, optional) Confirmation target (in blocks)\n"
+                                                                                                           "9. \"estimate_mode\"      (string, optional, default=UNSET) The fee estimate mode, must be one of:\n"
                                                                                                            "       \"UNSET\"\n"
                                                                                                            "       \"ECONOMICAL\"\n"
                                                                                                            "       \"CONSERVATIVE\"\n"
@@ -540,35 +555,43 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)
 
     // Wallet comments
     mapValue_t mapValue;
+
+
     if (!request.params[2].isNull() && !request.params[2].get_str().empty())
         mapValue["comment"] = request.params[2].get_str();
     if (!request.params[3].isNull() && !request.params[3].get_str().empty())
         mapValue["to"] = request.params[3].get_str();
 
-    bool fSubtractFeeFromAmount = false;
-    if (!request.params[4].isNull()) {
-        fSubtractFeeFromAmount = request.params[4].get_bool();
+    int amountOfSplits = 1;
+    if (!request.params[4].isNull())
+    {
+        amountOfSplits = request.params[4].get_int();
     }
 
-    CCoinControl coin_control;
+    bool fSubtractFeeFromAmount = false;
     if (!request.params[5].isNull()) {
-        coin_control.m_signal_bip125_rbf = request.params[5].get_bool();
+        fSubtractFeeFromAmount = request.params[5].get_bool();
     }
 
+    CCoinControl coin_control;
     if (!request.params[6].isNull()) {
-        coin_control.m_confirm_target = ParseConfirmTarget(request.params[6]);
+        coin_control.m_signal_bip125_rbf = request.params[6].get_bool();
     }
 
     if (!request.params[7].isNull()) {
-        if (!FeeModeFromString(request.params[7].get_str(), coin_control.m_fee_mode)) {
+        coin_control.m_confirm_target = ParseConfirmTarget(request.params[7]);
+    }
+
+    if (!request.params[8].isNull()) {
+        if (!FeeModeFromString(request.params[8].get_str(), coin_control.m_fee_mode)) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid estimate_mode parameter");
         }
     }
 
 
     EnsureWalletIsUnlocked(pwallet);
 
-    CTransactionRef tx = SendMoney(pwallet, dest, nAmount, fSubtractFeeFromAmount, coin_control, std::move(mapValue), {} /* fromAccount */);
+    CTransactionRef tx = SendMoney(pwallet, dest, nAmount, fSubtractFeeFromAmount, amountOfSplits, coin_control, std::move(mapValue), {} /* fromAccount */);
     return tx->GetHash().GetHex();
 }
 
@@ -1055,7 +1078,7 @@ static UniValue sendfrom(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");
 
     CCoinControl no_coin_control; // This is a deprecated API
-    CTransactionRef tx = SendMoney(pwallet, dest, nAmount, false, no_coin_control, std::move(mapValue), std::move(strAccount));
+    CTransactionRef tx = SendMoney(pwallet, dest, nAmount, false, 1, no_coin_control, std::move(mapValue), std::move(strAccount));
     return tx->GetHash().GetHex();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -601,6 +601,7 @@ void SetupServerArgs()`
`601`	`601`	`gArgs.AddArg("-server", "Accept command line and JSON-RPC commands", false, OptionsCategory::RPC);`
`602`	`602`
`603`	`603`	`gArgs.AddArg("-sporkkey", "Private key to send spork messages", false, OptionsCategory::OPTIONS);`
	`604`	`+ gArgs.AddArg("-staking", "Enable staking while working with wallet, default is 1", false, OptionsCategory::OPTIONS);`
`604`	`605`	`gArgs.AddArg("-masternode=<n>", "Enable the client to act as a masternode (0-1, default: false", false, OptionsCategory::MASTERNODE);`
`605`	`606`	`gArgs.AddArg("-mnconf=<file>", "Specify masternode configuration file (default: masternode.conf)", false, OptionsCategory::MASTERNODE);`
`606`	`607`	`gArgs.AddArg("-mnconflock=<n>", "Lock masternodes from masternode configuration file (default: %u)", false, OptionsCategory::MASTERNODE);`
`@@ -2004,7 +2005,7 @@ bool AppInitMain()`
`2004`	`2005`	`uiInterface.InitMessage(_("Done loading"));`
`2005`	`2006`
`2006`	`2007`	`g_wallet_init_interface.Start(scheduler);`
`2007`		`- if(GetWallets().front())`
	`2008`	`+ if(GetWallets().front() && gArgs.GetBoolArg("-staking", true))`
`2008`	`2009`	`{`
`2009`	`2010`	`threadGroup.create_thread(std::bind(&ThreadStakeMinter, boost::ref(chainparams), boost::ref(connman), GetWallets().front()));`
`2010`	`2011`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void AskPassphraseDialog::accept()`
`112`	`112`	`break;`
`113`	`113`	`}`
`114`	`114`	`QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"),`
`115`		`- tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"),`
	`115`	`+ tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR XSN</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"),`
`116`	`116`	`QMessageBox::Yes\|QMessageBox::Cancel,`
`117`	`117`	`QMessageBox::Cancel);`
`118`	`118`	`if(retval == QMessageBox::Yes)`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ UniValue tposcontract(const JSONRPCRequest& request)`
`461`	`461`	`strCommand = request.params[0].get_str();`
`462`	`462`	`}`
`463`	`463`
`464`		`- if (request.fHelp \|\| (strCommand != "list" && strCommand != "create" && strCommand != "refresh"))`
	`464`	`+ if (request.fHelp \|\| (strCommand != "list" && strCommand != "create" && strCommand != "refresh" && strCommand != "cleanup"))`
`465`	`465`	`throw std::runtime_error(`
`466`	`466`	`"tposcontract \"command\"...\n"`
`467`	`467`	`"Set of commands to execute merchantnode related actions\n"`