Merge branch 'master' of https://github.com/syscoin/syscoin

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:syscoin:p:syscoin:r:qt-translation-444x]
+[o:syscoin:p:syscoin:r:qt-translation-45xx]
 file_filter = src/qt/locale/syscoin_<lang>.xlf
 source_file = src/qt/locale/syscoin_en.xlf
 source_lang = en

src/net.h

@@ -64,7 +64,7 @@ static constexpr auto FEELER_INTERVAL = 2min;
 /** Run the extra block-relay-only connection loop once every 5 minutes. **/
 static constexpr auto EXTRA_BLOCK_RELAY_ONLY_PEER_INTERVAL = 5min;
 // SYSCOIN
-/**  
+/**
  * Maximum length of incoming protocol messages (no message over 32 MiB is
  * currently acceptable).  Bitcoin has 4 MiB here, but we need more space
  * to allow for 2,000 block headers with auxpow.
@@ -1278,7 +1278,7 @@ class CConnman
                 func(node);
         }
     };
-    
+
     void ForEachNode(const NodeFn& func) const
     {
         ForEachNode(FullyConnectedOnly, func);

src/wallet/feebumper.cpp

@@ -264,7 +264,7 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo
         } else {
             // SYSCOIN
             if(new_coin_control.m_nevmdata.empty() && !output.vchNEVMData.empty()) {
-                new_coin_control.m_nevmdata = output.vchNEVMData; 
+                new_coin_control.m_nevmdata = output.vchNEVMData;
             }
             CRecipient recipient = {dest, output.nValue, false};
             recipients.push_back(recipient);

src/wallet/spend.cpp

@@ -1336,7 +1336,7 @@ bool FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& nFeeRet,
         const CTxOut& txOut = tx.vout[idx];
         // SYSCOIN
         if(coinControl.m_nevmdata.empty() && !txOut.vchNEVMData.empty()) {
-            coinControl.m_nevmdata = txOut.vchNEVMData; 
+            coinControl.m_nevmdata = txOut.vchNEVMData;
         }
         CTxDestination dest;
         ExtractDestination(txOut.scriptPubKey, dest);